diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-07-16 02:42:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-07-16 02:42:44 +0000 |
| commit | 7736e72e1d8b9fde543fe755454f4446b1328098 (patch) | |
| tree | 1a8d3d5ccd8d17b83782abe18e8272bc0e90a241 /ui/gtk/bytes_view.c | |
| parent | 30199499438e9053f1db29b73e0dd3876ef1635b (diff) | |
| download | wireshark-7736e72e1d8b9fde543fe755454f4446b1328098.tar.gz | |
<gtk/gtkmarshal.h> doesn't appear to be necessary, at least with GTK+
2.24.5. Remove the include of it.
Get rid of duplicate #undefs of GTK_DISABLE_DEPRECATED and GSEAL_ENABLE
- nothing in config.h should depend on them.
Make at least some of the changes that
http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459694
and
http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459754
seem to indicate we need to make for GTK+ 3.
svn path=/trunk/; revision=43739
Diffstat (limited to 'ui/gtk/bytes_view.c')
| -rw-r--r-- | ui/gtk/bytes_view.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index 73750d20ae..b0713e1de9 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -30,8 +30,6 @@ */ #ifdef HAVE_CONFIG_H -#undef GTK_DISABLE_DEPRECATED -#undef GSEAL_ENABLE #include "config.h" #endif @@ -39,9 +37,6 @@ #undef GSEAL_ENABLE #include <gtk/gtk.h> -#if !GTK_CHECK_VERSION(3, 0, 0) -#include <gtk/gtkmarshal.h> -#endif #include "ui/gtk/old-gtk-compat.h" #include <string.h> @@ -913,15 +908,23 @@ bytes_view_set_scroll_adjustments(BytesView *bv, GtkAdjustment *hadj, GtkAdjustm static void bytes_view_class_init(BytesViewClass *klass) { +#if !GTK_CHECK_VERSION(3, 0, 0) GtkObjectClass *object_class; +#endif GtkWidgetClass *widget_class; parent_class = (GtkWidgetClass *) g_type_class_peek_parent(klass); +#if !GTK_CHECK_VERSION(3, 0, 0) object_class = (GtkObjectClass *) klass; +#endif widget_class = (GtkWidgetClass *) klass; +#if GTK_CHECK_VERSION(3, 0, 0) + widget_class->destroy = bytes_view_destroy; +#else object_class->destroy = bytes_view_destroy; +#endif widget_class->realize = bytes_view_realize; widget_class->unrealize = bytes_view_unrealize; widget_class->size_request = bytes_view_size_request; @@ -929,6 +932,12 @@ bytes_view_class_init(BytesViewClass *klass) widget_class->expose_event = bytes_view_expose; widget_class->scroll_event = bytes_view_scroll; +#if GTK_CHECK_VERSION(3, 0, 0) + /* XXX - see + + http://developer.gnome.org/gtk3/stable/GtkScrollable.html + */ +#else klass->set_scroll_adjustments = bytes_view_set_scroll_adjustments; widget_class->set_scroll_adjustments_signal = @@ -942,6 +951,7 @@ bytes_view_class_init(BytesViewClass *klass) G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); +#endif } GType |