* 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 "config.h"
#include "gtkbin.h"
+#include "gtkextendedlayout.h"
+#include "gtkintl.h"
#include "gtkalias.h"
-
-static void gtk_bin_class_init (GtkBinClass *klass);
-static void gtk_bin_init (GtkBin *bin);
static void gtk_bin_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_bin_remove (GtkContainer *container,
gpointer callback_data);
static GType gtk_bin_child_type (GtkContainer *container);
+static void gtk_bin_extended_layout_interface_init (GtkExtendedLayoutIface *iface);
-static GtkContainerClass *parent_class = NULL;
-
+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))
-GType
-gtk_bin_get_type (void)
-{
- static GType bin_type = 0;
-
- if (!bin_type)
- {
- static const GTypeInfo bin_info =
- {
- sizeof (GtkBinClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_bin_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkBin),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_bin_init,
- NULL, /* value_table */
- };
-
- bin_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkBin"),
- &bin_info, G_TYPE_FLAG_ABSTRACT);
- }
-
- return bin_type;
-}
static void
gtk_bin_class_init (GtkBinClass *class)
container_class = (GtkContainerClass*) class;
- parent_class = g_type_class_peek_parent (class);
-
container_class->add = gtk_bin_add;
container_class->remove = gtk_bin_remove;
container_class->forall = gtk_bin_forall;
{
GtkBin *bin = GTK_BIN (container);
- g_return_if_fail (GTK_IS_WIDGET (child));
-
if (bin->child != NULL)
{
g_warning ("Attempting to add a widget with type %s to a %s, "
GtkBin *bin = GTK_BIN (container);
gboolean widget_was_visible;
- g_return_if_fail (GTK_IS_WIDGET (child));
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)
{
GtkBin *bin = GTK_BIN (container);
- g_return_if_fail (callback != NULL);
-
if (bin->child)
(* callback) (bin->child, callback_data);
}
* 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)
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"
projects / ~andy / gtk / blobdiff