Mercurial > pidgin
comparison pidgin/gtkimhtmltoolbar.c @ 32686:3538e783b98c
Fix all deprecated GTK_WIDGET_* macros.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 09 Oct 2011 02:50:20 +0000 |
parents | 787609e41f20 |
children | 763d65f3f758 |
comparison
equal
deleted
inserted
replaced
32685:457443ca22e0 | 32686:3538e783b98c |
---|---|
41 #include "gtkthemes.h" | 41 #include "gtkthemes.h" |
42 #include "gtkutils.h" | 42 #include "gtkutils.h" |
43 | 43 |
44 #include <gdk/gdkkeysyms.h> | 44 #include <gdk/gdkkeysyms.h> |
45 | 45 |
46 #if !GTK_CHECK_VERSION(2,18,0) | |
47 #define gtk_widget_get_visible(x) GTK_WIDGET_VISIBLE(x) | |
48 #define gtk_widget_is_sensitive(x) GTK_WIDGET_IS_SENSITIVE(x) | |
49 #endif | |
50 | |
46 static GtkHBoxClass *parent_class = NULL; | 51 static GtkHBoxClass *parent_class = NULL; |
47 | 52 |
48 static void toggle_button_set_active_block(GtkToggleButton *button, | 53 static void toggle_button_set_active_block(GtkToggleButton *button, |
49 gboolean is_active, | 54 gboolean is_active, |
50 GtkIMHtmlToolbar *toolbar); | 55 GtkIMHtmlToolbar *toolbar); |
1194 gboolean wide; | 1199 gboolean wide; |
1195 | 1200 |
1196 if (event->button != 3) | 1201 if (event->button != 3) |
1197 return FALSE; | 1202 return FALSE; |
1198 | 1203 |
1199 wide = GTK_WIDGET_VISIBLE(toolbar->bold); | 1204 wide = gtk_widget_get_visible(toolbar->bold); |
1200 | 1205 |
1201 menu = gtk_menu_new(); | 1206 menu = gtk_menu_new(); |
1202 item = gtk_menu_item_new_with_mnemonic(wide ? _("Group Items") : _("Ungroup Items")); | 1207 item = gtk_menu_item_new_with_mnemonic(wide ? _("Group Items") : _("Ungroup Items")); |
1203 g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(switch_toolbar_view), toolbar); | 1208 g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(switch_toolbar_view), toolbar); |
1204 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); | 1209 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); |
1289 } | 1294 } |
1290 | 1295 |
1291 static void | 1296 static void |
1292 button_visibility_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item) | 1297 button_visibility_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item) |
1293 { | 1298 { |
1294 if (GTK_WIDGET_VISIBLE(button)) | 1299 if (gtk_widget_get_visible(button)) |
1295 gtk_widget_hide(item); | 1300 gtk_widget_hide(item); |
1296 else | 1301 else |
1297 gtk_widget_show(item); | 1302 gtk_widget_show(item); |
1298 } | 1303 } |
1299 | 1304 |
1300 static void | 1305 static void |
1301 button_sensitiveness_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item) | 1306 button_sensitiveness_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item) |
1302 { | 1307 { |
1303 gtk_widget_set_sensitive(item, GTK_WIDGET_IS_SENSITIVE(button)); | 1308 gtk_widget_set_sensitive(item, gtk_widget_is_sensitive(button)); |
1304 } | 1309 } |
1305 | 1310 |
1306 static void | 1311 static void |
1307 update_menuitem(GtkToggleButton *button, GtkCheckMenuItem *item) | 1312 update_menuitem(GtkToggleButton *button, GtkCheckMenuItem *item) |
1308 { | 1313 { |