diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-14 09:43:53 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-14 09:43:53 +0000 |
| commit | 21884ced5e4a566826dc49f01bb18d05d68d16ca (patch) | |
| tree | cea6f8a0c3f1e271506fe8fec7ef7fec2d109384 /gtk/main_filter_toolbar.c | |
| parent | 5474c14d22b838ea7fdf7a62f0435de31a543451 (diff) | |
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’
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38015 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/main_filter_toolbar.c')
| -rw-r--r-- | gtk/main_filter_toolbar.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c index fc9b71561b..3c015f4bd5 100644 --- a/gtk/main_filter_toolbar.c +++ b/gtk/main_filter_toolbar.c @@ -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); |