]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkbin.c
Deprecate widget flag: GTK_WIDGET_VISIBLE
[~andy/gtk] / gtk / gtkbin.c
index 392c160de80be2656ac15f3f6e794f4809dc037b..3a503c26858f8c5149fd6060602e194886e50113 100644 (file)
@@ -2,90 +2,61 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include "gtkbin.h"
-
-
-static void gtk_bin_class_init (GtkBinClass    *klass);
-static void gtk_bin_init       (GtkBin         *bin);
-static void gtk_bin_map        (GtkWidget      *widget);
-static void gtk_bin_unmap      (GtkWidget      *widget);
-static void gtk_bin_draw       (GtkWidget      *widget,
-                               GdkRectangle   *area);
-static gint gtk_bin_expose     (GtkWidget      *widget,
-                               GdkEventExpose *event);
-static void gtk_bin_add        (GtkContainer   *container,
-                               GtkWidget      *widget);
-static void gtk_bin_remove     (GtkContainer   *container,
-                               GtkWidget      *widget);
-static void gtk_bin_foreach    (GtkContainer   *container,
-                               GtkCallback     callback,
-                               gpointer        callback_data);
-static GtkType gtk_bin_child_type (GtkContainer*container);
 
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
 
-static GtkContainerClass *parent_class = NULL;
+#include "config.h"
+#include "gtkbin.h"
+#include "gtkextendedlayout.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
 
+static void gtk_bin_add         (GtkContainer   *container,
+                                GtkWidget      *widget);
+static void gtk_bin_remove      (GtkContainer   *container,
+                                GtkWidget      *widget);
+static void gtk_bin_forall      (GtkContainer   *container,
+                                gboolean       include_internals,
+                                GtkCallback     callback,
+                                gpointer        callback_data);
+static GType gtk_bin_child_type (GtkContainer   *container);
 
-GtkType
-gtk_bin_get_type (void)
-{
-  static guint bin_type = 0;
+static void gtk_bin_extended_layout_interface_init (GtkExtendedLayoutIface *iface);
 
-  if (!bin_type)
-    {
-      GtkTypeInfo bin_info =
-      {
-       "GtkBin",
-       sizeof (GtkBin),
-       sizeof (GtkBinClass),
-       (GtkClassInitFunc) gtk_bin_class_init,
-       (GtkObjectInitFunc) gtk_bin_init,
-       /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      bin_type = gtk_type_unique (GTK_TYPE_CONTAINER, &bin_info);
-    }
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER,
+                                  G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
+                                                        gtk_bin_extended_layout_interface_init))
 
-  return bin_type;
-}
 
 static void
 gtk_bin_class_init (GtkBinClass *class)
 {
-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
 
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
   container_class = (GtkContainerClass*) class;
 
-  parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
-
-  widget_class->map = gtk_bin_map;
-  widget_class->unmap = gtk_bin_unmap;
-  widget_class->draw = gtk_bin_draw;
-  widget_class->expose_event = gtk_bin_expose;
-
   container_class->add = gtk_bin_add;
   container_class->remove = gtk_bin_remove;
-  container_class->foreach = gtk_bin_foreach;
+  container_class->forall = gtk_bin_forall;
   container_class->child_type = gtk_bin_child_type;
 }
 
@@ -98,181 +69,136 @@ gtk_bin_init (GtkBin *bin)
 }
 
 
-static GtkType
+static GType
 gtk_bin_child_type (GtkContainer *container)
 {
   if (!GTK_BIN (container)->child)
     return GTK_TYPE_WIDGET;
   else
-    return GTK_TYPE_NONE;
+    return G_TYPE_NONE;
 }
 
 static void
-gtk_bin_map (GtkWidget *widget)
+gtk_bin_add (GtkContainer *container,
+            GtkWidget    *child)
 {
-  GtkBin *bin;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_BIN (widget));
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-  bin = GTK_BIN (widget);
+  GtkBin *bin = GTK_BIN (container);
 
-  if (!GTK_WIDGET_NO_WINDOW (widget))
-    gdk_window_show (widget->window);
-  else
-    gtk_widget_queue_draw (widget);
+  if (bin->child != NULL)
+    {
+      g_warning ("Attempting to add a widget with type %s to a %s, "
+                 "but as a GtkBin subclass a %s can only contain one widget at a time; "
+                 "it already contains a widget of type %s",
+                 g_type_name (G_OBJECT_TYPE (child)),
+                 g_type_name (G_OBJECT_TYPE (bin)),
+                 g_type_name (G_OBJECT_TYPE (bin)),
+                 g_type_name (G_OBJECT_TYPE (bin->child)));
+      return;
+    }
 
-  if (bin->child &&
-      GTK_WIDGET_VISIBLE (bin->child) &&
-      !GTK_WIDGET_MAPPED (bin->child))
-    gtk_widget_map (bin->child);
+  gtk_widget_set_parent (child, GTK_WIDGET (bin));
+  bin->child = child;
 }
 
 static void
-gtk_bin_unmap (GtkWidget *widget)
+gtk_bin_remove (GtkContainer *container,
+               GtkWidget    *child)
 {
-  GtkBin *bin;
+  GtkBin *bin = GTK_BIN (container);
+  gboolean widget_was_visible;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_BIN (widget));
-
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-  bin = GTK_BIN (widget);
-
-  if (GTK_WIDGET_NO_WINDOW (widget))
-    gdk_window_clear_area (widget->window,
-                          widget->allocation.x,
-                          widget->allocation.y,
-                          widget->allocation.width,
-                          widget->allocation.height);
-  else
-    gdk_window_hide (widget->window);
+  g_return_if_fail (bin->child == child);
 
-  if (bin->child &&
-      GTK_WIDGET_VISIBLE (bin->child) &&
-      GTK_WIDGET_MAPPED (bin->child))
-    gtk_widget_unmap (bin->child);
+  widget_was_visible = gtk_widget_get_visible (child);
+  
+  gtk_widget_unparent (child);
+  bin->child = NULL;
+  
+  /* queue resize regardless of gtk_widget_get_visible (container),
+   * since that's what is needed by toplevels, which derive from GtkBin.
+   */
+  if (widget_was_visible)
+    gtk_widget_queue_resize (GTK_WIDGET (container));
 }
 
 static void
-gtk_bin_draw (GtkWidget    *widget,
-             GdkRectangle *area)
+gtk_bin_forall (GtkContainer *container,
+               gboolean      include_internals,
+               GtkCallback   callback,
+               gpointer      callback_data)
 {
-  GtkBin *bin;
-  GdkRectangle child_area;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_BIN (widget));
+  GtkBin *bin = GTK_BIN (container);
 
-  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
-    {
-      bin = GTK_BIN (widget);
-
-      if (bin->child &&
-         gtk_widget_intersect (bin->child, area, &child_area))
-        gtk_widget_draw (bin->child, &child_area);
-    }
+  if (bin->child)
+    (* callback) (bin->child, callback_data);
 }
 
-static gint
-gtk_bin_expose (GtkWidget      *widget,
-               GdkEventExpose *event)
+/**
+ * gtk_bin_get_child:
+ * @bin: a #GtkBin
+ * 
+ * Gets the child of the #GtkBin, or %NULL if the bin contains
+ * no child widget. The returned widget does not have a reference
+ * added, so you do not need to unref it.
+ *
+ * Return value: (transfer none): pointer to child of the #GtkBin
+ **/
+GtkWidget*
+gtk_bin_get_child (GtkBin *bin)
 {
-  GtkBin *bin;
-  GdkEventExpose child_event;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_BIN (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      bin = GTK_BIN (widget);
-
-      child_event = *event;
-      if (bin->child &&
-         GTK_WIDGET_NO_WINDOW (bin->child) &&
-         gtk_widget_intersect (bin->child, &event->area, &child_event.area))
-       gtk_widget_event (bin->child, (GdkEvent*) &child_event);
-    }
+  g_return_val_if_fail (GTK_IS_BIN (bin), NULL);
 
-  return FALSE;
+  return bin->child;
 }
 
-
 static void
-gtk_bin_add (GtkContainer *container,
-            GtkWidget    *widget)
+gtk_bin_extended_layout_get_desired_size (GtkExtendedLayout *layout,
+                                          GtkRequisition    *minimum_size,
+                                          GtkRequisition    *natural_size)
 {
-  GtkBin *bin;
-
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_BIN (container));
-  g_return_if_fail (widget != NULL);
+  GtkBin *bin = GTK_BIN (layout);
 
-  bin = GTK_BIN (container);
-  g_return_if_fail (bin->child == NULL);
+  g_return_if_fail (GTK_IS_EXTENDED_LAYOUT (bin->child));
 
-  gtk_widget_set_parent (widget, GTK_WIDGET (container));
-  
-  if (GTK_WIDGET_VISIBLE (widget->parent))
-    {
-      if (GTK_WIDGET_REALIZED (widget->parent) &&
-         !GTK_WIDGET_REALIZED (widget))
-       gtk_widget_realize (widget);
-      
-      if (GTK_WIDGET_MAPPED (widget->parent) &&
-         !GTK_WIDGET_MAPPED (widget))
-       gtk_widget_map (widget);
-    }
-  
-  bin->child = widget;
-  
-  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container))
-    gtk_widget_queue_resize (widget);
+  gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (bin->child),
+                                        minimum_size, natural_size);
 }
 
 static void
-gtk_bin_remove (GtkContainer *container,
-               GtkWidget    *widget)
+gtk_bin_extended_layout_get_width_for_height (GtkExtendedLayout *layout,
+                                              gint               height,
+                                              gint              *minimum_width,
+                                              gint              *natural_width)
 {
-  GtkBin *bin;
-
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_BIN (container));
-  g_return_if_fail (widget != NULL);
-
-  bin = GTK_BIN (container);
-
-  if (bin->child == widget)
-    {
-      gboolean widget_was_visible = GTK_WIDGET_VISIBLE (widget);
+  GtkBin *bin = GTK_BIN (layout);
 
-      gtk_widget_unparent (widget);
-      bin->child = NULL;
+  g_return_if_fail (GTK_IS_EXTENDED_LAYOUT (bin->child));
 
-      /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
-       * since that's what is needed by toplevels, which derive from GtkBin.
-       */
-      if (widget_was_visible)
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-    }
+  gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (bin->child),
+                                            height, minimum_width, natural_width);
 }
 
 static void
-gtk_bin_foreach (GtkContainer *container,
-                GtkCallback   callback,
-                gpointer      callback_data)
+gtk_bin_extended_layout_get_height_for_width (GtkExtendedLayout *layout,
+                                              gint               width,
+                                              gint              *minimum_height,
+                                              gint              *natural_height)
 {
-  GtkBin *bin;
+  GtkBin *bin = GTK_BIN (layout);
 
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_BIN (container));
-  g_return_if_fail (callback != NULL);
+  g_return_if_fail (GTK_IS_EXTENDED_LAYOUT (bin->child));
 
-  bin = GTK_BIN (container);
+  gtk_extended_layout_get_height_for_width (GTK_EXTENDED_LAYOUT (bin->child),
+                                            width, minimum_height, natural_height);
+}
 
-  if (bin->child)
-    (* callback) (bin->child, callback_data);
+static void
+gtk_bin_extended_layout_interface_init (GtkExtendedLayoutIface *iface)
+{
+  iface->get_desired_size = gtk_bin_extended_layout_get_desired_size;
+  iface->get_height_for_width = gtk_bin_extended_layout_get_height_for_width;
+  iface->get_width_for_height = gtk_bin_extended_layout_get_width_for_height;
 }
+
+#define __GTK_BIN_C__
+#include "gtkaliasdef.c"