osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix the last non-gtkitemfactory stuff for use with -DGTK_DISABLE_DEPRECATED. 

Left are:

gtk/menus.c:4382:5: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/menus.c:4382:26: error: ‘sep_entry’ undeclared (first use in this function)
gtk/proto_help.c:79:16: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token
gtk/proto_help.c:166:2: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:166:2: error: implicit declaration of function ‘gtk_item_factory_from_widget’
gtk/proto_help.c:181:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:183:2: error: implicit declaration of function ‘gtk_item_factory_get_widget’
gtk/proto_help.c:191:2: error: implicit declaration of function ‘gtk_item_factory_get_item’
gtk/proto_help.c:216:2: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/proto_help.c:216:23: error: ‘menu_entry’ undeclared (first use in this function)
gtk/proto_help.c:217:2: error: ISO C90 forbids mixed declarations and code
gtk/proto_help.c:222:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:258:4: error: implicit declaration of function ‘gtk_item_factory_create_item’


svn path=/trunk/; revision=38015
This commit is contained in:
Jörg Mayer 2011-07-14 09:43:53 +00:00
parent f8a7d85e1c
commit c04911c06a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/main_filter_toolbar.c
View File

@ -104,8 +104,13 @@ GtkWidget *filter_toolbar_new(void)
/* filter toolbar */
filter_tb = gtk_toolbar_new();
#if GTK_CHECK_VERSION(2,16,0)
gtk_orientable_set_orientation(GTK_ORIENTABLE(filter_tb),
GTK_ORIENTATION_HORIZONTAL);
#else
gtk_toolbar_set_orientation(GTK_TOOLBAR(filter_tb),
GTK_ORIENTATION_HORIZONTAL);
#endif
g_object_set_data(G_OBJECT(top_level), E_TB_FILTER_KEY, filter_tb);
gtk_widget_show(filter_tb);

5
gtk/main_toolbar.c
View File

@ -287,8 +287,13 @@ toolbar_new(void)
/* toolbar will be horizontal, with both icons and text (as default here) */
/* (this will usually be overwritten by the preferences setting) */
main_tb = gtk_toolbar_new();
#if GTK_CHECK_VERSION(2,16,0)
gtk_orientable_set_orientation(GTK_ORIENTABLE(main_tb),
GTK_ORIENTATION_HORIZONTAL);
#else
gtk_toolbar_set_orientation(GTK_TOOLBAR(main_tb),
GTK_ORIENTATION_HORIZONTAL);
#endif
g_object_set_data(G_OBJECT(top_level), E_TB_MAIN_KEY, main_tb);