Initialize the scrollbar spacing variable in the class to -1, and then

[~andy/gtk] / gtk / gtkscrolledwindow.c

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 2e48e668f6c5b00a2e6322163ef63eaed5ed6d57..299ef5be6606b533d18e897fae80e1b64228232b 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -67,9 +67,11 @@
  *    under A) at least correspond to the space taken up by its scrollbars.
  */
 
-#define SCROLLBAR_SPACING(w) (GTK_SCROLLED_WINDOW_GET_CLASS (w)->scrollbar_spacing)
+#define DEFAULT_SCROLLBAR_SPACING  3
 
-#define DEFAULT_SCROLLBAR_SPACING  0
+#define SCROLLBAR_SPACING(w)                                                           \
+  (GTK_SCROLLED_WINDOW_GET_CLASS (w)->scrollbar_spacing >= 0 ?                         \
+   GTK_SCROLLED_WINDOW_GET_CLASS (w)->scrollbar_spacing : DEFAULT_SCROLLBAR_SPACING)
 
 enum {
   PROP_0,
@@ -223,7 +225,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
   container_class->remove = gtk_scrolled_window_remove;
   container_class->forall = gtk_scrolled_window_forall;
 
-  class->scrollbar_spacing = DEFAULT_SCROLLBAR_SPACING;
+  class->scrollbar_spacing = -1;
 
   class->scroll_child = gtk_scrolled_window_scroll_child;
   class->move_focus_out = gtk_scrolled_window_move_focus_out;