summaryrefslogtreecommitdiff
path: root/ui/gtk/bytes_view.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2012-07-20 11:59:20 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2012-07-20 11:59:20 +0000
commit642861a4e1720e48fc2862bff23af79708ff1b17 (patch)
treea9190d1f30795c282ef713d406598f5f16eab1de /ui/gtk/bytes_view.c
parent0441109c330fb1ed3c72e10b9715b0919f1e6b2a (diff)
downloadwireshark-642861a4e1720e48fc2862bff23af79708ff1b17.tar.gz
Fix bug #7502
In gtk3 upper value of adjustment can't be smaller than page_size. Otherwise strange things happens ;-) svn path=/trunk/; revision=43856
Diffstat (limited to 'ui/gtk/bytes_view.c')
-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 a973e604bd..3721285953 100644
--- a/ui/gtk/bytes_view.c
+++ b/ui/gtk/bytes_view.c
@@ -921,6 +921,11 @@ _gtk_adjustment_configure(GtkAdjustment *adj,
gtk_adjustment_changed(adj);
}
+#elif GTK_CHECK_VERSION(3, 0, 0)
+
+#define _gtk_adjustment_configure(adj, val, low, up, step, page, size) \
+ gtk_adjustment_configure(adj, val, low, MAX((up), (size)), step, page, size)
+
#else
#define _gtk_adjustment_configure(adj, val, low, up, step, page, size) \