diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-07-19 14:57:15 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-07-19 14:57:15 +0000 |
| commit | aa49527fa78bf5b3a3f1394092b248e27e1bfa3f (patch) | |
| tree | a1b7651c9e379ab1f7ffe2af68727cdccdf682e6 /gtk/gtkitem.c | |
| parent | 8f2bf7976d73ba58b808002268c49a19e9b586ee (diff) | |
| download | gtk+-aa49527fa78bf5b3a3f1394092b248e27e1bfa3f.tar.gz | |
Enforce the widget/child realization/mapping invariants.
Sat Jul 7 02:50:14 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_set_parent): Enforce
the widget/child realization/mapping invariants.
* gtk/gtkwidget.[ch] gtk/gtkprivate.h: Add functions
gtk_widget_[get/set]_child_visible() to control
whether visible children of a mapped window are
mapped.
* docs/widget_system.txt: Updated for changes in
container contract, and addition of GTK_CHILD_VISIBLE.
* gtk/gtkcontainer.c: Add generic map()/unmap()
functions that work for almost all containers.
* gtk/gtknotebook.c gtk/gtkpacker.c: Use
gtk_widget_set_child_visible() where necessary.
* gtk/*.c: Remove excess map(), unmap(), and
realization/mapping invariant enforcing code
from many containers.
Diffstat (limited to 'gtk/gtkitem.c')
| -rw-r--r-- | gtk/gtkitem.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c index 76b38d9eba..839928cc22 100644 --- a/gtk/gtkitem.c +++ b/gtk/gtkitem.c @@ -38,8 +38,6 @@ enum { static void gtk_item_class_init (GtkItemClass *klass); static void gtk_item_init (GtkItem *item); -static void gtk_item_map (GtkWidget *widget); -static void gtk_item_unmap (GtkWidget *widget); static void gtk_item_realize (GtkWidget *widget); static gint gtk_item_enter (GtkWidget *widget, GdkEventCrossing *event); @@ -85,8 +83,6 @@ gtk_item_class_init (GtkItemClass *class) widget_class = (GtkWidgetClass*) class; - widget_class->map = gtk_item_map; - widget_class->unmap = gtk_item_unmap; widget_class->realize = gtk_item_realize; widget_class->enter_notify_event = gtk_item_enter; widget_class->leave_notify_event = gtk_item_leave; @@ -145,35 +141,6 @@ gtk_item_toggle (GtkItem *item) static void -gtk_item_map (GtkWidget *widget) -{ - GtkBin *bin; - - g_return_if_fail (GTK_IS_ITEM (widget)); - - GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - - bin = GTK_BIN (widget); - - if (bin->child && - GTK_WIDGET_VISIBLE (bin->child) && - !GTK_WIDGET_MAPPED (bin->child)) - gtk_widget_map (bin->child); - - gdk_window_show (widget->window); -} - -static void -gtk_item_unmap (GtkWidget *widget) -{ - g_return_if_fail (GTK_IS_ITEM (widget)); - - GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); - - gdk_window_hide (widget->window); -} - -static void gtk_item_realize (GtkWidget *widget) { GdkWindowAttr attributes; |