diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-01-28 04:12:58 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-01-28 04:12:58 +0000 |
| commit | 5e836af8846c44a253270c8925381d2922a203c7 (patch) | |
| tree | d11355ab55dcb8322afa0066b7a0bc782a5c4c61 /gtk | |
| parent | a29d25821e496fba3fe319c11dbf539aa9f12992 (diff) | |
| download | gtk+-5e836af8846c44a253270c8925381d2922a203c7.tar.gz | |
Move gravity_works back to a static global variable, since it is a global
Wed Jan 27 23:05:55 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.[ch] (gtk_layout_realize): Move
gravity_works back to a static global variable,
since it is a global constant, and this way we
keep structure sizes uniform.
CV: ---------------------------------------------------------------------- CVS: Enter Log. Lines beginning with `CVS: ' are removed automatically
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtklayout.c | 15 | ||||
| -rw-r--r-- | gtk/gtklayout.h | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index 85cc99057a..353c3f1a8c 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -110,6 +110,7 @@ static void gtk_layout_remove_child_cb (GdkWindow *parent, static GtkWidgetClass *parent_class = NULL; +static gboolean gravity_works; /* Public interface */ @@ -473,7 +474,11 @@ gtk_layout_realize (GtkWidget *widget) gdk_window_add_filter (widget->window, gtk_layout_main_filter, layout); gdk_window_add_filter (layout->bin_window, gtk_layout_filter, layout); - layout->gravity_works = gdk_window_set_static_gravities (layout->bin_window, TRUE); + /* XXX: If we ever get multiple displays for GTK+, then gravity_works + * will have to become a widget member. Right now we just + * keep it as a global + */ + gravity_works = gdk_window_set_static_gravities (layout->bin_window, TRUE); tmp_list = layout->children; while (tmp_list) @@ -939,7 +944,7 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment, if (dx > 0) { - if (layout->gravity_works) + if (gravity_works) { gdk_window_resize (layout->bin_window, widget->allocation.width + dx, @@ -963,7 +968,7 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment, } else if (dx < 0) { - if (layout->gravity_works) + if (gravity_works) { gdk_window_move_resize (layout->bin_window, dx, 0, @@ -988,7 +993,7 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment, if (dy > 0) { - if (layout->gravity_works) + if (gravity_works) { gdk_window_resize (layout->bin_window, widget->allocation.width, @@ -1012,7 +1017,7 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment, } else if (dy < 0) { - if (layout->gravity_works) + if (gravity_works) { gdk_window_move_resize (layout->bin_window, 0, dy, diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index 862da8b69e..d42718e221 100644 --- a/gtk/gtklayout.h +++ b/gtk/gtklayout.h @@ -63,8 +63,6 @@ struct _GtkLayout { gint scroll_y; guint freeze_count; - - guint gravity_works : 1; }; struct _GtkLayoutClass { |