Mercurial > pidgin.yaz
comparison src/gtkmenutray.c @ 11888:7d2d926704aa
[gaim-migrate @ 14179]
Gtk 2.0 support. Deja Vu.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sat, 29 Oct 2005 14:45:15 +0000 |
parents | c9188d3eb9d3 |
children | 34ea75bdd0c9 |
comparison
equal
deleted
inserted
replaced
11887:6f514bb8f0a9 | 11888:7d2d926704aa |
---|---|
119 } | 119 } |
120 | 120 |
121 static void | 121 static void |
122 gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) { | 122 gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) { |
123 GtkWidget *widget = GTK_WIDGET(menu_tray); | 123 GtkWidget *widget = GTK_WIDGET(menu_tray); |
124 #if GTK_CHECK_VERSION(2,2,0) | |
124 GtkSettings *settings; | 125 GtkSettings *settings; |
126 #endif | |
125 gint height = -1; | 127 gint height = -1; |
126 | 128 |
127 gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); | 129 gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); |
128 | 130 |
129 if(!GTK_IS_WIDGET(menu_tray->tray)) | 131 if(!GTK_IS_WIDGET(menu_tray->tray)) |
130 menu_tray->tray = gtk_hbox_new(FALSE, 0); | 132 menu_tray->tray = gtk_hbox_new(FALSE, 0); |
131 | 133 |
132 #if GTK_CHECK_VERSION(2,2,0) | 134 #if GTK_CHECK_VERSION(2,2,0) |
133 settings = | 135 settings = |
134 gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); | 136 gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); |
135 #else | |
136 settings = gtk_settings_get_default(); | |
137 #endif | |
138 | 137 |
139 if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU, | 138 if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU, |
140 NULL, &height)) | 139 NULL, &height)) |
140 #else | |
141 if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height)) | |
142 #endif | |
141 { | 143 { |
142 gtk_widget_set_size_request(widget, -1, height); | 144 gtk_widget_set_size_request(widget, -1, height); |
143 } | 145 } |
144 | 146 |
145 gtk_container_add(GTK_CONTAINER(menu_tray), menu_tray->tray); | 147 gtk_container_add(GTK_CONTAINER(menu_tray), menu_tray->tray); |