summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2012-07-17 14:33:06 +0000
committerJörg Mayer <jmayer@loplof.de>2012-07-17 14:33:06 +0000
commit6bd20171efe922797c08502553f83f508b1bf6b6 (patch)
treec47c19da075956f09cdd39358a6f94485d0c378b
parentc312f140221ecef09f399289050c537581257dff (diff)
downloadwireshark-6bd20171efe922797c08502553f83f508b1bf6b6.tar.gz
Bring compilation with gtk 2.24 one step further (not yet working)
svn path=/trunk/; revision=43766
-rw-r--r--ui/gtk/bytes_view.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c
index cefe5ac195..056175cb2c 100644
--- a/ui/gtk/bytes_view.c
+++ b/ui/gtk/bytes_view.c
@@ -757,7 +757,12 @@ bytes_view_render(BytesView *bv, cairo_t *cr, GdkRectangle *area)
width = gtk_widget_get_allocated_width(GTK_WIDGET(bv));
height = gtk_widget_get_allocated_height(GTK_WIDGET(bv));
#else
+# if GTK_CHECK_VERSION(2,24,0)
+ width = gdk_window_get_width(GTK_WIDGET(bv));
+ height = gdk_window_get_height (GTK_WIDGET(bv));
+# else
gdk_drawable_get_size(gtk_widget_get_window(GTK_WIDGET(bv)), &width, &height);
+# endif
#endif
if (width < 32 + MARGIN || height < bv->fontsize)