From 613453b1095e325149b8d37e5731d415e1d5f9bd Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 31 Oct 2002 21:30:57 +0000 Subject: merging the gal-2 branch back to the trunk. merging the gal-2 branch back to the trunk. svn path=/trunk/; revision=18471 --- widgets/misc/test-color.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'widgets/misc/test-color.c') diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c index c61dc26889..364e0644de 100644 --- a/widgets/misc/test-color.c +++ b/widgets/misc/test-color.c @@ -20,6 +20,8 @@ * 02111-1307, USA. */ +#include +#include #include #include "widget-color-combo.h" #include "color-palette.h" @@ -39,10 +41,13 @@ main ( gint argc, gchar* argv[] ) GtkWidget * T; ColorGroup *cg; - gnome_init ("tester", "1.0", argc, argv); + gnome_program_init ("tester", "1.0", + LIBGNOMEUI_MODULE, + argc, argv, NULL); dialog = gnome_dialog_new ("TESTER", GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL); + cg = color_group_fetch ("fore_color_group", dialog); T = color_palette_new ("Color Palette", NULL, cg); @@ -51,15 +56,17 @@ main ( gint argc, gchar* argv[] ) gtk_widget_show_all (T); cg = color_group_fetch ("fore_color_group", dialog); - T = color_combo_new (cursor_hand_open_xpm, _("Automatic"), - &e_black, cg); + T = color_combo_new ( + gdk_pixbuf_new_from_xpm_data ((char const **)cursor_hand_open_xpm), + _("Automatic"), &e_black, cg); gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), T, TRUE, TRUE, 5); gtk_widget_show_all (T); cg = color_group_fetch ("back_color_group", dialog); - T = color_combo_new (cursor_hand_open_xpm, _("Automatic"), - &e_black, cg); + T = color_combo_new ( + gdk_pixbuf_new_from_xpm_data ((char const **)cursor_hand_open_xpm), + _("Automatic"), &e_black, cg); gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), T, TRUE, TRUE, 5); gtk_widget_show_all (T); -- cgit v1.2.3