Revert "Implement extended layout for GtkBin"

[~andy/gtk] / gtk / gtkbin.c

diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index 812f2df6da463c16deafd4892d80eae13f1ee9bb..16f13794eecdf3f80530b50a96e2543feecdbae6 100644 (file)
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -21,12 +21,11 @@
  * 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/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
 #include "config.h"
 #include "gtkbin.h"
-#include "gtkextendedlayout.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -40,12 +39,8 @@ static void gtk_bin_forall      (GtkContainer   *container,
                                 gpointer        callback_data);
 static GType gtk_bin_child_type (GtkContainer   *container);
 
-static void gtk_bin_extended_layout_interface_init (GtkExtendedLayoutIface *iface);
-
-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))
 
+G_DEFINE_ABSTRACT_TYPE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER)
 
 static void
 gtk_bin_class_init (GtkBinClass *class)
@@ -63,7 +58,7 @@ gtk_bin_class_init (GtkBinClass *class)
 static void
 gtk_bin_init (GtkBin *bin)
 {
-  GTK_WIDGET_SET_FLAGS (bin, GTK_NO_WINDOW);
+  gtk_widget_set_has_window (GTK_WIDGET (bin), FALSE);
 
   bin->child = NULL;
 }
@@ -109,12 +104,12 @@ gtk_bin_remove (GtkContainer *container,
 
   g_return_if_fail (bin->child == child);
 
-  widget_was_visible = GTK_WIDGET_VISIBLE (child);
+  widget_was_visible = gtk_widget_get_visible (child);
   
   gtk_widget_unparent (child);
   bin->child = NULL;
   
-  /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
+  /* 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)
@@ -140,8 +135,8 @@ gtk_bin_forall (GtkContainer *container,
  * 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: pointer to child of the #GtkBin
+ *
+ * Return value: (transfer none): pointer to child of the #GtkBin
  **/
 GtkWidget*
 gtk_bin_get_child (GtkBin *bin)
@@ -151,54 +146,5 @@ gtk_bin_get_child (GtkBin *bin)
   return bin->child;
 }
 
-static void
-gtk_bin_extended_layout_get_desired_size (GtkExtendedLayout *layout,
-                                          GtkRequisition    *minimum_size,
-                                          GtkRequisition    *natural_size)
-{
-  GtkBin *bin = GTK_BIN (layout);
-
-  g_return_if_fail (GTK_IS_EXTENDED_LAYOUT (bin->child));
-
-  gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (bin->child),
-                                        minimum_size, natural_size);
-}
-
-static void
-gtk_bin_extended_layout_get_width_for_height (GtkExtendedLayout *layout,
-                                              gint               height,
-                                              gint              *minimum_width,
-                                              gint              *natural_width)
-{
-  GtkBin *bin = GTK_BIN (layout);
-
-  g_return_if_fail (GTK_IS_EXTENDED_LAYOUT (bin->child));
-
-  gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (bin->child),
-                                            height, minimum_width, natural_width);
-}
-
-static void
-gtk_bin_extended_layout_get_height_for_width (GtkExtendedLayout *layout,
-                                              gint               width,
-                                              gint              *minimum_height,
-                                              gint               natural_height)
-{
-  GtkBin *bin = GTK_BIN (layout);
-
-  g_return_if_fail (GTK_IS_EXTENDED_LAYOUT (bin->child));
-
-  gtk_extended_layout_get_height_for_width (GTK_EXTENDED_LAYOUT (bin->child),
-                                            width, minimum_height, natural_height);
-}
-
-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"