* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
#include "gtkfixed.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+enum {
+ CHILD_PROP_0,
+ CHILD_PROP_X,
+ CHILD_PROP_Y
+};
-
-static void gtk_fixed_class_init (GtkFixedClass *klass);
-static void gtk_fixed_init (GtkFixed *fixed);
-static void gtk_fixed_map (GtkWidget *widget);
static void gtk_fixed_realize (GtkWidget *widget);
static void gtk_fixed_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_fixed_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_fixed_paint (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_fixed_expose (GtkWidget *widget,
- GdkEventExpose *event);
static void gtk_fixed_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_fixed_remove (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-static GtkType gtk_fixed_child_type (GtkContainer *container);
-
-
-static GtkContainerClass *parent_class = NULL;
-
+static GType gtk_fixed_child_type (GtkContainer *container);
-GtkType
-gtk_fixed_get_type (void)
-{
- static GtkType fixed_type = 0;
-
- if (!fixed_type)
- {
- static const GtkTypeInfo fixed_info =
- {
- "GtkFixed",
- sizeof (GtkFixed),
- sizeof (GtkFixedClass),
- (GtkClassInitFunc) gtk_fixed_class_init,
- (GtkObjectInitFunc) gtk_fixed_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- fixed_type = gtk_type_unique (GTK_TYPE_CONTAINER, &fixed_info);
- }
+static void gtk_fixed_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_fixed_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
- return fixed_type;
-}
+G_DEFINE_TYPE (GtkFixed, gtk_fixed, GTK_TYPE_CONTAINER)
static void
gtk_fixed_class_init (GtkFixedClass *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_fixed_map;
widget_class->realize = gtk_fixed_realize;
widget_class->size_request = gtk_fixed_size_request;
widget_class->size_allocate = gtk_fixed_size_allocate;
- widget_class->expose_event = gtk_fixed_expose;
container_class->add = gtk_fixed_add;
container_class->remove = gtk_fixed_remove;
container_class->forall = gtk_fixed_forall;
container_class->child_type = gtk_fixed_child_type;
+
+ container_class->set_child_property = gtk_fixed_set_child_property;
+ container_class->get_child_property = gtk_fixed_get_child_property;
+
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_X,
+ g_param_spec_int ("x",
+ P_("X position"),
+ P_("X position of child widget"),
+ G_MININT,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
+
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_Y,
+ g_param_spec_int ("y",
+ P_("Y position"),
+ P_("Y position of child widget"),
+ G_MININT,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
}
-static GtkType
+static GType
gtk_fixed_child_type (GtkContainer *container)
{
return GTK_TYPE_WIDGET;
static void
gtk_fixed_init (GtkFixed *fixed)
{
- GTK_WIDGET_UNSET_FLAGS (fixed, GTK_NO_WINDOW);
-
+ gtk_widget_set_has_window (GTK_WIDGET (fixed), FALSE);
+
fixed->children = NULL;
}
GtkWidget*
gtk_fixed_new (void)
{
- GtkFixed *fixed;
+ return g_object_new (GTK_TYPE_FIXED, NULL);
+}
+
+static GtkFixedChild*
+get_child (GtkFixed *fixed,
+ GtkWidget *widget)
+{
+ GList *children;
+
+ children = fixed->children;
+ while (children)
+ {
+ GtkFixedChild *child;
+
+ child = children->data;
+ children = children->next;
- fixed = gtk_type_new (GTK_TYPE_FIXED);
- return GTK_WIDGET (fixed);
+ if (child->widget == widget)
+ return child;
+ }
+
+ return NULL;
}
void
gtk_fixed_put (GtkFixed *fixed,
GtkWidget *widget,
- gint16 x,
- gint16 y)
+ gint x,
+ gint y)
{
GtkFixedChild *child_info;
- g_return_if_fail (fixed != NULL);
g_return_if_fail (GTK_IS_FIXED (fixed));
- g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
child_info = g_new (GtkFixedChild, 1);
child_info->widget = widget;
gtk_widget_set_parent (widget, GTK_WIDGET (fixed));
- fixed->children = g_list_append (fixed->children, child_info);
+ fixed->children = g_list_append (fixed->children, child_info);
+}
+
+static void
+gtk_fixed_move_internal (GtkFixed *fixed,
+ GtkWidget *widget,
+ gboolean change_x,
+ gint x,
+ gboolean change_y,
+ gint y)
+{
+ GtkFixedChild *child;
+
+ g_return_if_fail (GTK_IS_FIXED (fixed));
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (widget->parent == GTK_WIDGET (fixed));
+
+ child = get_child (fixed, widget);
+
+ g_assert (child);
- if (GTK_WIDGET_REALIZED (fixed))
- gtk_widget_realize (widget);
+ gtk_widget_freeze_child_notify (widget);
+
+ if (change_x)
+ {
+ child->x = x;
+ gtk_widget_child_notify (widget, "x");
+ }
- if (GTK_WIDGET_VISIBLE (fixed) && GTK_WIDGET_VISIBLE (widget))
+ if (change_y)
{
- if (GTK_WIDGET_MAPPED (fixed))
- gtk_widget_map (widget);
-
- gtk_widget_queue_resize (GTK_WIDGET (fixed));
+ child->y = y;
+ gtk_widget_child_notify (widget, "y");
}
+
+ gtk_widget_thaw_child_notify (widget);
+
+ if (gtk_widget_get_visible (widget) &&
+ gtk_widget_get_visible (GTK_WIDGET (fixed)))
+ gtk_widget_queue_resize (GTK_WIDGET (fixed));
}
void
gtk_fixed_move (GtkFixed *fixed,
GtkWidget *widget,
- gint16 x,
- gint16 y)
+ gint x,
+ gint y)
{
- GtkFixedChild *child;
- GList *children;
-
- g_return_if_fail (fixed != NULL);
- g_return_if_fail (GTK_IS_FIXED (fixed));
- g_return_if_fail (widget != NULL);
+ gtk_fixed_move_internal (fixed, widget, TRUE, x, TRUE, y);
+}
- children = fixed->children;
- while (children)
+static void
+gtk_fixed_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id)
{
- child = children->data;
- children = children->next;
-
- if (child->widget == widget)
- {
- child->x = x;
- child->y = y;
-
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (fixed))
- gtk_widget_queue_resize (GTK_WIDGET (fixed));
-
- break;
- }
+ case CHILD_PROP_X:
+ gtk_fixed_move_internal (GTK_FIXED (container),
+ child,
+ TRUE, g_value_get_int (value),
+ FALSE, 0);
+ break;
+ case CHILD_PROP_Y:
+ gtk_fixed_move_internal (GTK_FIXED (container),
+ child,
+ FALSE, 0,
+ TRUE, g_value_get_int (value));
+ break;
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ break;
}
}
static void
-gtk_fixed_map (GtkWidget *widget)
+gtk_fixed_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- GtkFixed *fixed;
- GtkFixedChild *child;
- GList *children;
+ GtkFixedChild *fixed_child;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_FIXED (widget));
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
- fixed = GTK_FIXED (widget);
-
- children = fixed->children;
- while (children)
+ fixed_child = get_child (GTK_FIXED (container), child);
+
+ switch (property_id)
{
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget) &&
- !GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_map (child->widget);
+ case CHILD_PROP_X:
+ g_value_set_int (value, fixed_child->x);
+ break;
+ case CHILD_PROP_Y:
+ g_value_set_int (value, fixed_child->y);
+ break;
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ break;
}
-
- gdk_window_show (widget->window);
}
static void
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_FIXED (widget));
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = gtk_widget_get_events (widget);
- attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK;
-
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
- widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes,
- attributes_mask);
- gdk_window_set_user_data (widget->window, widget);
-
- widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+ if (!gtk_widget_get_has_window (widget))
+ GTK_WIDGET_CLASS (gtk_fixed_parent_class)->realize (widget);
+ else
+ {
+ GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.x = widget->allocation.x;
+ attributes.y = widget->allocation.y;
+ attributes.width = widget->allocation.width;
+ attributes.height = widget->allocation.height;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.visual = gtk_widget_get_visual (widget);
+ attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK;
+
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+ widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes,
+ attributes_mask);
+ gdk_window_set_user_data (widget->window, widget);
+
+ widget->style = gtk_style_attach (widget->style, widget->window);
+ gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+ }
}
static void
GList *children;
GtkRequisition child_requisition;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_FIXED (widget));
- g_return_if_fail (requisition != NULL);
-
fixed = GTK_FIXED (widget);
requisition->width = 0;
requisition->height = 0;
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
gtk_widget_size_request (child->widget, &child_requisition);
GList *children;
guint16 border_width;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_FIXED(widget));
- g_return_if_fail (allocation != NULL);
-
fixed = GTK_FIXED (widget);
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize (widget->window,
- allocation->x,
- allocation->y,
- allocation->width,
- allocation->height);
+ if (gtk_widget_get_has_window (widget))
+ {
+ if (GTK_WIDGET_REALIZED (widget))
+ gdk_window_move_resize (widget->window,
+ allocation->x,
+ allocation->y,
+ allocation->width,
+ allocation->height);
+ }
+
border_width = GTK_CONTAINER (fixed)->border_width;
children = fixed->children;
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
gtk_widget_get_child_requisition (child->widget, &child_requisition);
child_allocation.x = child->x + border_width;
child_allocation.y = child->y + border_width;
+
+ if (!gtk_widget_get_has_window (widget))
+ {
+ child_allocation.x += widget->allocation.x;
+ child_allocation.y += widget->allocation.y;
+ }
+
child_allocation.width = child_requisition.width;
child_allocation.height = child_requisition.height;
gtk_widget_size_allocate (child->widget, &child_allocation);
}
}
-static void
-gtk_fixed_paint (GtkWidget *widget,
- GdkRectangle *area)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_FIXED (widget));
- g_return_if_fail (area != NULL);
-
- if (GTK_WIDGET_DRAWABLE (widget))
- gdk_window_clear_area (widget->window,
- area->x, area->y,
- area->width, area->height);
-}
-
-static gint
-gtk_fixed_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- GtkFixed *fixed;
- GtkFixedChild *child;
- GdkEventExpose child_event;
- GList *children;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_FIXED (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- fixed = GTK_FIXED (widget);
-
- child_event = *event;
-
- children = fixed->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_NO_WINDOW (child->widget) &&
- gtk_widget_intersect (child->widget, &event->area,
- &child_event.area))
- gtk_widget_event (child->widget, (GdkEvent*) &child_event);
- }
- }
-
- return FALSE;
-}
-
static void
gtk_fixed_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_FIXED (container));
- g_return_if_fail (widget != NULL);
-
gtk_fixed_put (GTK_FIXED (container), widget, 0, 0);
}
{
GtkFixed *fixed;
GtkFixedChild *child;
+ GtkWidget *widget_container;
GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_FIXED (container));
- g_return_if_fail (widget != NULL);
-
fixed = GTK_FIXED (container);
+ widget_container = GTK_WIDGET (container);
children = fixed->children;
while (children)
if (child->widget == widget)
{
- gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
+ gboolean was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
g_list_free (children);
g_free (child);
- if (was_visible && GTK_WIDGET_VISIBLE (container))
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ if (was_visible && gtk_widget_get_visible (widget_container))
+ gtk_widget_queue_resize (widget_container);
break;
}
GtkCallback callback,
gpointer callback_data)
{
- GtkFixed *fixed;
+ GtkFixed *fixed = GTK_FIXED (container);
GtkFixedChild *child;
GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_FIXED (container));
- g_return_if_fail (callback != NULL);
-
- fixed = GTK_FIXED (container);
-
children = fixed->children;
while (children)
{
(* callback) (child->widget, callback_data);
}
}
+
+/**
+ * gtk_fixed_set_has_window:
+ * @fixed: a #GtkFixed
+ * @has_window: %TRUE if a separate window should be created
+ *
+ * Sets whether a #GtkFixed widget is created with a separate
+ * #GdkWindow for @widget->window or not. (By default, it will be
+ * created with no separate #GdkWindow). This function must be called
+ * while the #GtkFixed is not realized, for instance, immediately after the
+ * window is created.
+ *
+ * This function was added to provide an easy migration path for
+ * older applications which may expect #GtkFixed to have a separate window.
+ *
+ * Deprecated: 2.20: Use gtk_widget_set_has_window() instead.
+ **/
+void
+gtk_fixed_set_has_window (GtkFixed *fixed,
+ gboolean has_window)
+{
+ g_return_if_fail (GTK_IS_FIXED (fixed));
+ g_return_if_fail (!GTK_WIDGET_REALIZED (fixed));
+
+ if (has_window != gtk_widget_get_has_window (GTK_WIDGET (fixed)))
+ {
+ gtk_widget_set_has_window (GTK_WIDGET (fixed), has_window);
+ }
+}
+
+/**
+ * gtk_fixed_get_has_window:
+ * @fixed: a #GtkWidget
+ *
+ * Gets whether the #GtkFixed has its own #GdkWindow.
+ * See gtk_fixed_set_has_window().
+ *
+ * Return value: %TRUE if @fixed has its own window.
+ *
+ * Deprecated: 2.20: Use gtk_widget_get_has_window() instead.
+ **/
+gboolean
+gtk_fixed_get_has_window (GtkFixed *fixed)
+{
+ g_return_val_if_fail (GTK_IS_FIXED (fixed), FALSE);
+
+ return gtk_widget_get_has_window (GTK_WIDGET (fixed));
+}
+
+#define __GTK_FIXED_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff