* 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"
+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);
-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,
- GtkWidget *widget);
-static void gtk_bin_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data);
-static GtkType 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))
-static GtkContainerClass *parent_class = NULL;
-
-
-GtkType
-gtk_bin_get_type (void)
-{
- static GtkType bin_type = 0;
-
- if (!bin_type)
- {
- static const 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);
- }
-
- 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);
-
container_class->add = gtk_bin_add;
container_class->remove = gtk_bin_remove;
container_class->forall = gtk_bin_forall;
}
-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_add (GtkContainer *container,
GtkWidget *child)
{
- GtkBin *bin;
-
- g_return_if_fail (GTK_IS_BIN (container));
- g_return_if_fail (GTK_IS_WIDGET (child));
-
- bin = GTK_BIN (container);
+ GtkBin *bin = GTK_BIN (container);
if (bin->child != NULL)
{
gtk_bin_remove (GtkContainer *container,
GtkWidget *child)
{
- GtkBin *bin;
+ GtkBin *bin = GTK_BIN (container);
gboolean widget_was_visible;
- g_return_if_fail (GTK_IS_BIN (container));
- g_return_if_fail (GTK_IS_WIDGET (child));
-
- bin = GTK_BIN (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)
GtkCallback callback,
gpointer callback_data)
{
- GtkBin *bin;
-
- g_return_if_fail (GTK_IS_BIN (container));
- g_return_if_fail (callback != NULL);
-
- bin = GTK_BIN (container);
+ GtkBin *bin = GTK_BIN (container);
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