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/gtkframe.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/gtkframe.c')
| -rw-r--r-- | gtk/gtkframe.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 26f24b5779..98dfc509a6 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -60,8 +60,6 @@ static void gtk_frame_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static void gtk_frame_map (GtkWidget *widget); -static void gtk_frame_unmap (GtkWidget *widget); static void gtk_frame_remove (GtkContainer *container, GtkWidget *child); static void gtk_frame_forall (GtkContainer *container, @@ -168,8 +166,6 @@ gtk_frame_class_init (GtkFrameClass *class) widget_class->expose_event = gtk_frame_expose; widget_class->size_request = gtk_frame_size_request; widget_class->size_allocate = gtk_frame_size_allocate; - widget_class->map = gtk_frame_map; - widget_class->unmap = gtk_frame_unmap; container_class->remove = gtk_frame_remove; container_class->forall = gtk_frame_forall; @@ -639,32 +635,6 @@ gtk_frame_size_allocate (GtkWidget *widget, } static void -gtk_frame_map (GtkWidget *widget) -{ - GtkFrame *frame = GTK_FRAME (widget); - - if (frame->label_widget && - GTK_WIDGET_VISIBLE (frame->label_widget) && - !GTK_WIDGET_MAPPED (frame->label_widget)) - gtk_widget_map (frame->label_widget); - - if (GTK_WIDGET_CLASS (parent_class)->map) - (* GTK_WIDGET_CLASS (parent_class)->map) (widget); -} - -static void -gtk_frame_unmap (GtkWidget *widget) -{ - GtkFrame *frame = GTK_FRAME (widget); - - if (GTK_WIDGET_CLASS (parent_class)->unmap) - (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget); - - if (frame->label_widget && GTK_WIDGET_MAPPED (frame->label_widget)) - gtk_widget_unmap (frame->label_widget); -} - -static void gtk_frame_compute_child_allocation (GtkFrame *frame, GtkAllocation *child_allocation) { |