X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbin.c;h=b64f54156d58a124a8252eaa76807d1ea7f9b675;hb=563eb60666d9f72c38d7542b0ab37841e6aac488;hp=c0ba64fca52b34d0cd69b24cc51c5b14d19f5ff2;hpb=4851efe29604e1d950dc9711d9d7ced69771f2e9;p=~andy%2Fgtk diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index c0ba64fca..b64f54156 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -2,262 +2,347 @@ * 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 - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . */ -#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); +/* + * 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/. + */ +/** + * SECTION:gtkbin + * @Short_description: A container with just one child + * @Title: GtkBin + * + * The #GtkBin widget is a container with just one child. + * It is not very useful itself, but it is useful for deriving subclasses, + * since it provides common code needed for handling a single child widget. + * + * Many GTK+ widgets are subclasses of #GtkBin, including #GtkWindow, + * #GtkButton, #GtkFrame, #GtkHandleBox or #GtkScrolledWindow. + */ -static GtkContainerClass *parent_class = NULL; +#include "config.h" +#include "gtkbin.h" +#include "gtksizerequest.h" +#include "gtkintl.h" -guint -gtk_bin_get_type (void) +struct _GtkBinPrivate { - static guint bin_type = 0; - - if (!bin_type) - { - GtkTypeInfo bin_info = - { - "GtkBin", - sizeof (GtkBin), - sizeof (GtkBinClass), - (GtkClassInitFunc) gtk_bin_class_init, - (GtkObjectInitFunc) gtk_bin_init, - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL, - }; - - bin_type = gtk_type_unique (gtk_container_get_type (), &bin_info); - } - - return bin_type; -} + GtkWidget *child; +}; + +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_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width); +static void gtk_bin_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height); +static void gtk_bin_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum_width, + gint *natural_width); +static void gtk_bin_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum_height, + gint *natural_height); +static void gtk_bin_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); + +G_DEFINE_ABSTRACT_TYPE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER) static void gtk_bin_class_init (GtkBinClass *class) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + GtkWidgetClass *widget_class = (GtkWidgetClass*) class; + GtkContainerClass *container_class = (GtkContainerClass*) class; - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; - - parent_class = gtk_type_class (gtk_container_get_type ()); - - 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; + widget_class->get_preferred_width = gtk_bin_get_preferred_width; + widget_class->get_preferred_height = gtk_bin_get_preferred_height; + widget_class->get_preferred_width_for_height = gtk_bin_get_preferred_width_for_height; + widget_class->get_preferred_height_for_width = gtk_bin_get_preferred_height_for_width; + widget_class->size_allocate = gtk_bin_size_allocate; 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; + + g_type_class_add_private (class, sizeof (GtkBinPrivate)); } static void gtk_bin_init (GtkBin *bin) { - GTK_WIDGET_SET_FLAGS (bin, GTK_NO_WINDOW); + GtkBinPrivate *priv; + + bin->priv = G_TYPE_INSTANCE_GET_PRIVATE (bin, + GTK_TYPE_BIN, + GtkBinPrivate); + priv = bin->priv; - bin->child = NULL; + gtk_widget_set_has_window (GTK_WIDGET (bin), FALSE); + + priv->child = NULL; } -static void -gtk_bin_map (GtkWidget *widget) +static GType +gtk_bin_child_type (GtkContainer *container) { - GtkBin *bin; + GtkBinPrivate *priv = GTK_BIN (container)->priv; - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_BIN (widget)); + if (!priv->child) + return GTK_TYPE_WIDGET; + else + return G_TYPE_NONE; +} - GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - bin = GTK_BIN (widget); +static void +gtk_bin_add (GtkContainer *container, + GtkWidget *child) +{ + GtkBin *bin = GTK_BIN (container); + GtkBinPrivate *priv = bin->priv; - if (!GTK_WIDGET_NO_WINDOW (widget)) - gdk_window_show (widget->window); - else - gtk_widget_queue_draw (widget); + if (priv->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 (priv->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)); + priv->child = child; } static void -gtk_bin_unmap (GtkWidget *widget) +gtk_bin_remove (GtkContainer *container, + GtkWidget *child) { - GtkBin *bin; + GtkBin *bin = GTK_BIN (container); + GtkBinPrivate *priv = bin->priv; + gboolean widget_was_visible; - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_BIN (widget)); + g_return_if_fail (priv->child == child); - GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); - bin = GTK_BIN (widget); + widget_was_visible = gtk_widget_get_visible (child); + + gtk_widget_unparent (child); + priv->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)); +} - 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); +static void +gtk_bin_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) +{ + GtkBin *bin = GTK_BIN (container); + GtkBinPrivate *priv = bin->priv; + + if (priv->child) + (* callback) (priv->child, callback_data); +} - if (bin->child && - GTK_WIDGET_VISIBLE (bin->child) && - GTK_WIDGET_MAPPED (bin->child)) - gtk_widget_unmap (bin->child); +static int +gtk_bin_get_effective_border_width (GtkBin *bin) +{ + if (GTK_CONTAINER_CLASS (GTK_BIN_GET_CLASS (bin))->_handle_border_width) + return 0; + + return gtk_container_get_border_width (GTK_CONTAINER (bin)); } static void -gtk_bin_draw (GtkWidget *widget, - GdkRectangle *area) +gtk_bin_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width) { - GtkBin *bin; - GdkRectangle child_area; + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_BIN (widget)); + *minimum_width = 0; + *natural_width = 0; - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) + if (priv->child && gtk_widget_get_visible (priv->child)) { - bin = GTK_BIN (widget); + gint child_min, child_nat; + gtk_widget_get_preferred_width (priv->child, + &child_min, &child_nat); + *minimum_width = child_min; + *natural_width = child_nat; + } - if (bin->child && - gtk_widget_intersect (bin->child, area, &child_area)) - gtk_widget_draw (bin->child, &child_area); + border_width = gtk_bin_get_effective_border_width (bin); + *minimum_width += 2 * border_width; + *natural_width += 2 * border_width; +} + +static void +gtk_bin_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height) +{ + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; + + *minimum_height = 0; + *natural_height = 0; + + if (priv->child && gtk_widget_get_visible (priv->child)) + { + gint child_min, child_nat; + gtk_widget_get_preferred_height (priv->child, + &child_min, &child_nat); + *minimum_height = child_min; + *natural_height = child_nat; } + + border_width = gtk_bin_get_effective_border_width (bin); + *minimum_height += 2 * border_width; + *natural_height += 2 * border_width; } -static gint -gtk_bin_expose (GtkWidget *widget, - GdkEventExpose *event) +static void +gtk_bin_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum_width, + gint *natural_width) { - GtkBin *bin; - GdkEventExpose child_event; + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; - 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); + *minimum_width = 0; + *natural_width = 0; - if (GTK_WIDGET_DRAWABLE (widget)) + border_width = gtk_bin_get_effective_border_width (bin); + + if (priv->child && gtk_widget_get_visible (priv->child)) { - bin = GTK_BIN (widget); + gint child_min, child_nat; + gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width, + &child_min, &child_nat); - 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); + *minimum_width = child_min; + *natural_width = child_nat; } - return FALSE; + *minimum_width += 2 * border_width; + *natural_width += 2 * border_width; } - static void -gtk_bin_add (GtkContainer *container, - GtkWidget *widget) +gtk_bin_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum_height, + gint *natural_height) { - GtkBin *bin; + GtkBin *bin = GTK_BIN (widget); + GtkBinPrivate *priv = bin->priv; + gint border_width; - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_BIN (container)); - g_return_if_fail (widget != NULL); + *minimum_height = 0; + *natural_height = 0; - bin = GTK_BIN (container); - g_return_if_fail (bin->child == NULL); + border_width = gtk_bin_get_effective_border_width (bin); - gtk_widget_set_parent (widget, GTK_WIDGET (container)); - - if (GTK_WIDGET_VISIBLE (widget->parent)) + if (priv->child && gtk_widget_get_visible (priv->child)) { - 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); + gint child_min, child_nat; + gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width, + &child_min, &child_nat); + + *minimum_height = child_min; + *natural_height = child_nat; } - - bin->child = widget; - - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container)) - gtk_widget_queue_resize (widget); + + *minimum_height += 2 * border_width; + *natural_height += 2 * border_width; } static void -gtk_bin_remove (GtkContainer *container, - GtkWidget *widget) +gtk_bin_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) { - 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 (widget); + GtkBinPrivate *priv = bin->priv; - bin = GTK_BIN (container); + gtk_widget_set_allocation (widget, allocation); - if (bin->child == widget) + if (priv->child && gtk_widget_get_visible (priv->child)) { - gboolean widget_was_visible = GTK_WIDGET_VISIBLE (widget); + GtkAllocation child_allocation; + gint border_width = gtk_bin_get_effective_border_width (bin); - gtk_widget_unparent (widget); - bin->child = NULL; + child_allocation.x = allocation->x + border_width; + child_allocation.y = allocation->y + border_width; + child_allocation.width = allocation->width - 2 * border_width; + child_allocation.height = allocation->height - 2 * border_width; - if (widget_was_visible && GTK_WIDGET_VISIBLE (container)) - gtk_widget_queue_resize (GTK_WIDGET (container)); + gtk_widget_size_allocate (priv->child, &child_allocation); } } -static void -gtk_bin_foreach (GtkContainer *container, - GtkCallback callback, - gpointer callback_data) +/** + * 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; + g_return_val_if_fail (GTK_IS_BIN (bin), NULL); - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_BIN (container)); - g_return_if_fail (callback != NULL); - - bin = GTK_BIN (container); + return bin->priv->child; +} - if (bin->child) - (* callback) (bin->child, callback_data); +void +_gtk_bin_set_child (GtkBin *bin, + GtkWidget *widget) +{ + bin->priv->child = widget; }