applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove WID() macro, which has an incompatible definition in

Browse source 
2007-05-04  Thomas Wood  <thos@gnome.org>

	* appearance-desktop.c: (wp_add_images), (wp_dragged_image),
	(desktop_init):
	* appearance-main.c: (main):
	* appearance-themes.c: (themes_init):
	* appearance-ui.c: (set_toolbar_style), (set_have_icons),
	(ui_init):
	* appearance.h:
	Remove WID() macro, which has an incompatible definition in capplet-utils.h

svn path=/trunk/; revision=7549
This commit is contained in:
Thomas Wood 2007-05-04 17:11:12 +00:00 • committed by Thomas Wood
parent af3c712e63
commit 207ce87995
6 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
capplets/appearance/appearance-ui.c
View file

@ -35,9 +35,9 @@ static GConfEnumStringPair toolbar_style_enums[] = {
static void
show_handlebar (AppearanceData *data, gboolean show)
{
GtkWidget *handlebox = WID ("toolbar_handlebox");
GtkWidget *toolbar = WID ("toolbar_toolbar");
GtkWidget *align = WID ("toolbar_align");
GtkWidget *handlebox = glade_xml_get_widget (data->xml, "toolbar_handlebox");
GtkWidget *toolbar = glade_xml_get_widget (data->xml, "toolbar_toolbar");
GtkWidget *align = glade_xml_get_widget (data->xml, "toolbar_align");
g_object_ref (handlebox);
g_object_ref (toolbar);
@ -70,7 +70,7 @@ set_toolbar_style (AppearanceData *data, const char *value)
if (!gconf_string_to_enum (toolbar_style_enums, value, &enum_val))
enum_val = 0;
gtk_toolbar_set_style (GTK_TOOLBAR (WID("toolbar_toolbar")),
gtk_toolbar_set_style (GTK_TOOLBAR (glade_xml_get_widget (data->xml, "toolbar_toolbar")),
gtk_toolbar_styles[enum_val]);
}
@ -92,7 +92,7 @@ set_have_icons (AppearanceData *data, gboolean value)
const char **name;
for (name = menu_item_names; *name != NULL; name++) {
GtkImageMenuItem *item = GTK_IMAGE_MENU_ITEM (WID (*name));
GtkImageMenuItem *item = GTK_IMAGE_MENU_ITEM (glade_xml_get_widget (data->xml, *name));
GtkWidget *image;
if (value) {
@ -193,11 +193,11 @@ ui_init (AppearanceData *data)
peditor = gconf_peditor_new_boolean
(NULL, "/desktop/gnome/interface/can_change_accels",
WID ("menu_accel_toggle"), NULL);
glade_xml_get_widget (data->xml, "menu_accel_toggle"), NULL);
peditor = gconf_peditor_new_boolean
(NULL, "/desktop/gnome/interface/menus_have_icons",
WID ("menu_icons_toggle"), NULL);
glade_xml_get_widget (data->xml, "menu_icons_toggle"), NULL);
g_signal_connect (peditor, "value_changed",
G_CALLBACK (menus_have_icons_cb), data);
@ -208,14 +208,14 @@ ui_init (AppearanceData *data)
peditor = gconf_peditor_new_combo_box
(NULL, "/desktop/gnome/interface/toolbar_style",
WID ("toolbar_style_select"),
glade_xml_get_widget (data->xml, "toolbar_style_select"),
"conv-to-widget-cb", toolbar_to_widget,
"conv-from-widget-cb", toolbar_from_widget,
NULL);
g_signal_connect (peditor, "value_changed",
G_CALLBACK (toolbar_style_cb), data);
g_signal_connect (G_OBJECT (WID ("toolbar_handlebox")),
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "toolbar_handlebox")),
"button_press_event",
G_CALLBACK (button_press_block_cb), NULL);