diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-01 21:53:22 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-01 21:53:22 +0000 |
| commit | a6774264ee6203ba68fa273c0c6c63e75beaf5cf (patch) | |
| tree | 36ecf8b138ae4afaa6e679c97702472f7a4a83d3 /gtk | |
| parent | 3842f2f11d885e1f4313064ca05a041de54570dc (diff) | |
| download | gtk+-a6774264ee6203ba68fa273c0c6c63e75beaf5cf.tar.gz | |
Initialize the scrollbar spacing variable in the class to -1, and then
Fri Mar 1 16:48:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c: Initialize the scrollbar spacing
variable in the class to -1, and then take that to mean
"default" (3) rather than putting 3 in the class directly.
This gives us some wiggle room to make it a per-instance
rather than a per-class property later.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 2e48e668f6..299ef5be66 100644 --- 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; |