diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-21 23:58:08 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-21 23:58:08 +0000 |
| commit | 9c447f40eb9cb80b13403525c4d7581530fdcca5 (patch) | |
| tree | 05deaac7e2cd8079739cd67d8de4b06eed7dc72a /gtk/main_filter_toolbar.c | |
| parent | e66f3881884ce88236610799e20e7b8de75e574b (diff) | |
Handle more stuff in old-gtk-compat.h to avoid guarding in the code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38160 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/main_filter_toolbar.c')
| -rw-r--r-- | gtk/main_filter_toolbar.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c index 3c015f4bd5..e37aa22b67 100644 --- a/gtk/main_filter_toolbar.c +++ b/gtk/main_filter_toolbar.c @@ -50,6 +50,8 @@ #include "main_toolbar.h" #include "main_filter_toolbar.h" +#include "gtk/old-gtk-compat.h" + GtkWidget *main_display_filter_widget=NULL; /* Run the current display filter on the current packet set, and @@ -104,13 +106,8 @@ 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); |