#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
-#include "gtkalias.h"
+
typedef struct _GtkLayoutChild GtkLayoutChild;
+struct _GtkLayoutPriv
+{
+ /* Properties */
+ guint width;
+ guint height;
+
+ GtkAdjustment *hadjustment;
+ GtkAdjustment *vadjustment;
+ /* Properties */
+
+ GdkVisibilityState visibility;
+ GdkWindow *bin_window;
+
+ GList *children;
+
+ gint scroll_x;
+ gint scroll_y;
+
+ guint freeze_count;
+};
+
struct _GtkLayoutChild {
GtkWidget *widget;
gint x;
*/
/**
* gtk_layout_new:
- * @hadjustment: horizontal scroll adjustment, or %NULL
- * @vadjustment: vertical scroll adjustment, or %NULL
+ * @hadjustment: (allow-none): horizontal scroll adjustment, or %NULL
+ * @vadjustment: (allow-none): vertical scroll adjustment, or %NULL
*
* Creates a new #GtkLayout. Unless you have a specific adjustment
* you'd like the layout to use for scrolling, pass %NULL for
{
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
- return layout->bin_window;
+ return layout->priv->bin_window;
}
/**
{
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
- return layout->hadjustment;
+ return layout->priv->hadjustment;
}
/**
* gtk_layout_get_vadjustment:
{
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
- return layout->vadjustment;
+ return layout->priv->vadjustment;
}
static GtkAdjustment *
GtkAdjustment *hadj,
GtkAdjustment *vadj)
{
+ GtkLayoutPriv *priv = layout->priv;
gboolean need_adjust = FALSE;
- g_return_if_fail (GTK_IS_LAYOUT (layout));
-
if (hadj)
g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
- else if (layout->hadjustment)
+ else if (priv->hadjustment)
hadj = new_default_adjustment ();
if (vadj)
g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
- else if (layout->vadjustment)
+ else if (priv->vadjustment)
vadj = new_default_adjustment ();
-
- if (layout->hadjustment && (layout->hadjustment != hadj))
+
+ if (priv->hadjustment && (priv->hadjustment != hadj))
{
- g_signal_handlers_disconnect_by_func (layout->hadjustment,
+ g_signal_handlers_disconnect_by_func (priv->hadjustment,
gtk_layout_adjustment_changed,
layout);
- g_object_unref (layout->hadjustment);
+ g_object_unref (priv->hadjustment);
}
-
- if (layout->vadjustment && (layout->vadjustment != vadj))
+
+ if (priv->vadjustment && (priv->vadjustment != vadj))
{
- g_signal_handlers_disconnect_by_func (layout->vadjustment,
+ g_signal_handlers_disconnect_by_func (priv->vadjustment,
gtk_layout_adjustment_changed,
layout);
- g_object_unref (layout->vadjustment);
+ g_object_unref (priv->vadjustment);
}
-
- if (layout->hadjustment != hadj)
+
+ if (priv->hadjustment != hadj)
{
- layout->hadjustment = hadj;
- g_object_ref_sink (layout->hadjustment);
- gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE);
-
- g_signal_connect (layout->hadjustment, "value-changed",
+ priv->hadjustment = hadj;
+ g_object_ref_sink (priv->hadjustment);
+ gtk_layout_set_adjustment_upper (priv->hadjustment, priv->width, FALSE);
+
+ g_signal_connect (priv->hadjustment, "value-changed",
G_CALLBACK (gtk_layout_adjustment_changed),
layout);
need_adjust = TRUE;
}
-
- if (layout->vadjustment != vadj)
+
+ if (priv->vadjustment != vadj)
{
- layout->vadjustment = vadj;
- g_object_ref_sink (layout->vadjustment);
- gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE);
-
- g_signal_connect (layout->vadjustment, "value-changed",
+ priv->vadjustment = vadj;
+ g_object_ref_sink (priv->vadjustment);
+ gtk_layout_set_adjustment_upper (priv->vadjustment, priv->height, FALSE);
+
+ g_signal_connect (priv->vadjustment, "value-changed",
G_CALLBACK (gtk_layout_adjustment_changed),
layout);
need_adjust = TRUE;
gtk_layout_finalize (GObject *object)
{
GtkLayout *layout = GTK_LAYOUT (object);
+ GtkLayoutPriv *priv = layout->priv;
- g_object_unref (layout->hadjustment);
- g_object_unref (layout->vadjustment);
+ g_object_unref (priv->hadjustment);
+ g_object_unref (priv->vadjustment);
G_OBJECT_CLASS (gtk_layout_parent_class)->finalize (object);
}
/**
* gtk_layout_set_hadjustment:
* @layout: a #GtkLayout
- * @adjustment: new scroll adjustment
+ * @adjustment: (allow-none): new scroll adjustment
*
* Sets the horizontal scroll adjustment for the layout.
*
gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
+ GtkLayoutPriv *priv;
+
g_return_if_fail (GTK_IS_LAYOUT (layout));
- gtk_layout_set_adjustments (layout, adjustment, layout->vadjustment);
+ priv = layout->priv;
+
+ gtk_layout_set_adjustments (layout, adjustment, priv->vadjustment);
g_object_notify (G_OBJECT (layout), "hadjustment");
}
/**
* gtk_layout_set_vadjustment:
* @layout: a #GtkLayout
- * @adjustment: new scroll adjustment
+ * @adjustment: (allow-none): new scroll adjustment
*
* Sets the vertical scroll adjustment for the layout.
*
gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
+ GtkLayoutPriv *priv;
+
g_return_if_fail (GTK_IS_LAYOUT (layout));
-
- gtk_layout_set_adjustments (layout, layout->hadjustment, adjustment);
+
+ priv = layout->priv;
+
+ gtk_layout_set_adjustments (layout, priv->hadjustment, adjustment);
g_object_notify (G_OBJECT (layout), "vadjustment");
}
get_child (GtkLayout *layout,
GtkWidget *widget)
{
+ GtkLayoutPriv *priv = layout->priv;
GList *children;
-
- children = layout->children;
+
+ children = priv->children;
while (children)
{
GtkLayoutChild *child;
gint x,
gint y)
{
+ GtkLayoutPriv *priv;
GtkLayoutChild *child;
g_return_if_fail (GTK_IS_LAYOUT (layout));
g_return_if_fail (GTK_IS_WIDGET (child_widget));
-
+
+ priv = layout->priv;
+
child = g_new (GtkLayoutChild, 1);
child->widget = child_widget;
child->x = x;
child->y = y;
- layout->children = g_list_append (layout->children, child);
-
- if (GTK_WIDGET_REALIZED (layout))
- gtk_widget_set_parent_window (child->widget, layout->bin_window);
+ priv->children = g_list_append (priv->children, child);
+
+ if (gtk_widget_get_realized (GTK_WIDGET (layout)))
+ gtk_widget_set_parent_window (child->widget, priv->bin_window);
gtk_widget_set_parent (child_widget, GTK_WIDGET (layout));
}
gtk_widget_thaw_child_notify (widget);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (layout))
- gtk_widget_queue_resize (GTK_WIDGET (widget));
+ if (gtk_widget_get_visible (widget) &&
+ gtk_widget_get_visible (GTK_WIDGET (layout)))
+ gtk_widget_queue_resize (widget);
}
/**
guint width,
guint height)
{
+ GtkLayoutPriv *priv;
GtkWidget *widget;
-
+
g_return_if_fail (GTK_IS_LAYOUT (layout));
-
+
+ priv = layout->priv;
widget = GTK_WIDGET (layout);
-
+
g_object_freeze_notify (G_OBJECT (layout));
- if (width != layout->width)
+ if (width != priv->width)
{
- layout->width = width;
+ priv->width = width;
g_object_notify (G_OBJECT (layout), "width");
}
- if (height != layout->height)
+ if (height != priv->height)
{
- layout->height = height;
+ priv->height = height;
g_object_notify (G_OBJECT (layout), "height");
}
g_object_thaw_notify (G_OBJECT (layout));
- if (layout->hadjustment)
- gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE);
- if (layout->vadjustment)
- gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE);
+ if (priv->hadjustment)
+ gtk_layout_set_adjustment_upper (priv->hadjustment, priv->width, FALSE);
+ if (priv->vadjustment)
+ gtk_layout_set_adjustment_upper (priv->vadjustment, priv->height, FALSE);
- if (GTK_WIDGET_REALIZED (layout))
+ if (gtk_widget_get_realized (widget))
{
width = MAX (width, widget->allocation.width);
height = MAX (height, widget->allocation.height);
- gdk_window_resize (layout->bin_window, width, height);
+ gdk_window_resize (priv->bin_window, width, height);
}
}
/**
* gtk_layout_get_size:
* @layout: a #GtkLayout
- * @width: location to store the width set on @layout, or %NULL
- * @height: location to store the height set on @layout, or %NULL
+ * @width: (allow-none): location to store the width set on @layout, or %NULL
+ * @height: (allow-none): location to store the height set on @layout, or %NULL
*
* Gets the size that has been set on the layout, and that determines
* the total extents of the layout's scrollbar area. See
guint *width,
guint *height)
{
- g_return_if_fail (GTK_IS_LAYOUT (layout));
+ GtkLayoutPriv *priv;
- if (width)
- *width = layout->width;
- if (height)
- *height = layout->height;
-}
-
-/**
- * gtk_layout_freeze:
- * @layout: a #GtkLayout
- *
- * This is a deprecated function, it doesn't do anything useful.
- **/
-void
-gtk_layout_freeze (GtkLayout *layout)
-{
g_return_if_fail (GTK_IS_LAYOUT (layout));
- layout->freeze_count++;
-}
-
-/**
- * gtk_layout_thaw:
- * @layout: a #GtkLayout
- *
- * This is a deprecated function, it doesn't do anything useful.
- **/
-void
-gtk_layout_thaw (GtkLayout *layout)
-{
- g_return_if_fail (GTK_IS_LAYOUT (layout));
-
- if (layout->freeze_count)
- {
- if (!(--layout->freeze_count))
- {
- gtk_widget_queue_draw (GTK_WIDGET (layout));
- gdk_window_process_updates (GTK_WIDGET (layout)->window, TRUE);
- }
- }
+ priv = layout->priv;
+ if (width)
+ *width = priv->width;
+ if (height)
+ *height = priv->height;
}
/* Basic Object handling procedures
class->set_scroll_adjustments = gtk_layout_set_adjustments;
+ /**
+ * GtkLayout::set-scroll-adjustments
+ * @horizontal: the horizontal #GtkAdjustment
+ * @vertical: the vertical #GtkAdjustment
+ *
+ * Set the scroll adjustments for the layout. Usually scrolled containers
+ * like #GtkScrolledWindow will emit this signal to connect two instances
+ * of #GtkScrollbar to the scroll directions of the #GtkLayout.
+ */
widget_class->set_scroll_adjustments_signal =
g_signal_new (I_("set-scroll-adjustments"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT,
GTK_TYPE_ADJUSTMENT);
+
+ g_type_class_add_private (class, sizeof (GtkLayoutPriv));
}
static void
GParamSpec *pspec)
{
GtkLayout *layout = GTK_LAYOUT (object);
-
+ GtkLayoutPriv *priv = layout->priv;
+
switch (prop_id)
{
case PROP_HADJUSTMENT:
- g_value_set_object (value, layout->hadjustment);
+ g_value_set_object (value, priv->hadjustment);
break;
case PROP_VADJUSTMENT:
- g_value_set_object (value, layout->vadjustment);
+ g_value_set_object (value, priv->vadjustment);
break;
case PROP_WIDTH:
- g_value_set_uint (value, layout->width);
+ g_value_set_uint (value, priv->width);
break;
case PROP_HEIGHT:
- g_value_set_uint (value, layout->height);
+ g_value_set_uint (value, priv->height);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
GParamSpec *pspec)
{
GtkLayout *layout = GTK_LAYOUT (object);
-
+ GtkLayoutPriv *priv = layout->priv;
+
switch (prop_id)
{
case PROP_HADJUSTMENT:
break;
case PROP_WIDTH:
gtk_layout_set_size (layout, g_value_get_uint (value),
- layout->height);
+ priv->height);
break;
case PROP_HEIGHT:
- gtk_layout_set_size (layout, layout->width,
+ gtk_layout_set_size (layout, priv->width,
g_value_get_uint (value));
break;
default:
static void
gtk_layout_init (GtkLayout *layout)
{
- layout->children = NULL;
+ GtkLayoutPriv *priv;
+
+ layout->priv = G_TYPE_INSTANCE_GET_PRIVATE (layout,
+ GTK_TYPE_LAYOUT,
+ GtkLayoutPriv);
+ priv = layout->priv;
+
+ priv->children = NULL;
- layout->width = 100;
- layout->height = 100;
+ priv->width = 100;
+ priv->height = 100;
- layout->hadjustment = NULL;
- layout->vadjustment = NULL;
+ priv->hadjustment = NULL;
+ priv->vadjustment = NULL;
- layout->bin_window = NULL;
+ priv->bin_window = NULL;
- layout->scroll_x = 0;
- layout->scroll_y = 0;
- layout->visibility = GDK_VISIBILITY_PARTIAL;
+ priv->scroll_x = 0;
+ priv->scroll_y = 0;
+ priv->visibility = GDK_VISIBILITY_PARTIAL;
- layout->freeze_count = 0;
+ priv->freeze_count = 0;
}
static GObject *
guint n_properties,
GObjectConstructParam *properties)
{
+ GtkLayoutPriv *priv;
GtkLayout *layout;
GObject *object;
GtkAdjustment *hadj, *vadj;
properties);
layout = GTK_LAYOUT (object);
+ priv = layout->priv;
- hadj = layout->hadjustment ? layout->hadjustment : new_default_adjustment ();
- vadj = layout->vadjustment ? layout->vadjustment : new_default_adjustment ();
+ hadj = priv->hadjustment ? priv->hadjustment : new_default_adjustment ();
+ vadj = priv->vadjustment ? priv->vadjustment : new_default_adjustment ();
- if (!layout->hadjustment || !layout->vadjustment)
+ if (!priv->hadjustment || !priv->vadjustment)
gtk_layout_set_adjustments (layout, hadj, vadj);
return object;
gtk_layout_realize (GtkWidget *widget)
{
GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
GdkWindowAttr attributes;
gint attributes_mask;
- GTK_WIDGET_SET_FLAGS (layout, GTK_REALIZED);
+ gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
gdk_window_set_user_data (widget->window, widget);
- attributes.x = - layout->hadjustment->value,
- attributes.y = - layout->vadjustment->value;
- attributes.width = MAX (layout->width, widget->allocation.width);
- attributes.height = MAX (layout->height, widget->allocation.height);
+ attributes.x = - priv->hadjustment->value,
+ attributes.y = - priv->vadjustment->value;
+ attributes.width = MAX (priv->width, widget->allocation.width);
+ attributes.height = MAX (priv->height, widget->allocation.height);
attributes.event_mask = GDK_EXPOSURE_MASK | GDK_SCROLL_MASK |
gtk_widget_get_events (widget);
- layout->bin_window = gdk_window_new (widget->window,
+ priv->bin_window = gdk_window_new (widget->window,
&attributes, attributes_mask);
- gdk_window_set_user_data (layout->bin_window, widget);
+ gdk_window_set_user_data (priv->bin_window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, layout->bin_window, GTK_STATE_NORMAL);
+ gtk_style_set_background (widget->style, priv->bin_window, GTK_STATE_NORMAL);
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
GtkLayoutChild *child = tmp_list->data;
tmp_list = tmp_list->next;
- gtk_widget_set_parent_window (child->widget, layout->bin_window);
+ gtk_widget_set_parent_window (child->widget, priv->bin_window);
}
}
static void
-gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
+gtk_layout_style_set (GtkWidget *widget,
+ GtkStyle *old_style)
{
- if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set)
- GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
+ GtkLayoutPriv *priv;
- if (GTK_WIDGET_REALIZED (widget))
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
+
+ if (gtk_widget_get_realized (widget))
{
- gtk_style_set_background (widget->style, GTK_LAYOUT (widget)->bin_window, GTK_STATE_NORMAL);
+ priv = GTK_LAYOUT (widget)->priv;
+ gtk_style_set_background (widget->style, priv->bin_window, GTK_STATE_NORMAL);
}
}
gtk_layout_map (GtkWidget *widget)
{
GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
- GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+ gtk_widget_set_mapped (widget, TRUE);
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
GtkLayoutChild *child = tmp_list->data;
tmp_list = tmp_list->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
- if (!GTK_WIDGET_MAPPED (child->widget))
+ if (!gtk_widget_get_mapped (child->widget))
gtk_widget_map (child->widget);
}
}
- gdk_window_show (layout->bin_window);
+ gdk_window_show (priv->bin_window);
gdk_window_show (widget->window);
}
gtk_layout_unrealize (GtkWidget *widget)
{
GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
- gdk_window_set_user_data (layout->bin_window, NULL);
- gdk_window_destroy (layout->bin_window);
- layout->bin_window = NULL;
+ gdk_window_set_user_data (priv->bin_window, NULL);
+ gdk_window_destroy (priv->bin_window);
+ priv->bin_window = NULL;
- if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize)
- GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize (widget);
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize (widget);
}
static void
GtkRequisition *requisition)
{
GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
requisition->width = 0;
requisition->height = 0;
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
GtkAllocation *allocation)
{
GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
widget->allocation = *allocation;
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
gtk_layout_allocate_child (layout, child);
}
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
allocation->width, allocation->height);
- gdk_window_resize (layout->bin_window,
- MAX (layout->width, allocation->width),
- MAX (layout->height, allocation->height));
+ gdk_window_resize (priv->bin_window,
+ MAX (priv->width, allocation->width),
+ MAX (priv->height, allocation->height));
}
- layout->hadjustment->page_size = allocation->width;
- layout->hadjustment->page_increment = allocation->width * 0.9;
- layout->hadjustment->lower = 0;
+ priv->hadjustment->page_size = allocation->width;
+ priv->hadjustment->page_increment = allocation->width * 0.9;
+ priv->hadjustment->lower = 0;
/* set_adjustment_upper() emits ::changed */
- gtk_layout_set_adjustment_upper (layout->hadjustment, MAX (allocation->width, layout->width), TRUE);
+ gtk_layout_set_adjustment_upper (priv->hadjustment, MAX (allocation->width, priv->width), TRUE);
- layout->vadjustment->page_size = allocation->height;
- layout->vadjustment->page_increment = allocation->height * 0.9;
- layout->vadjustment->lower = 0;
- layout->vadjustment->upper = MAX (allocation->height, layout->height);
- gtk_layout_set_adjustment_upper (layout->vadjustment, MAX (allocation->height, layout->height), TRUE);
+ priv->vadjustment->page_size = allocation->height;
+ priv->vadjustment->page_increment = allocation->height * 0.9;
+ priv->vadjustment->lower = 0;
+ priv->vadjustment->upper = MAX (allocation->height, priv->height);
+ gtk_layout_set_adjustment_upper (priv->vadjustment, MAX (allocation->height, priv->height), TRUE);
}
static gint
GdkEventExpose *event)
{
GtkLayout *layout = GTK_LAYOUT (widget);
+ GtkLayoutPriv *priv = layout->priv;
- if (event->window != layout->bin_window)
+ if (event->window != priv->bin_window)
return FALSE;
GTK_WIDGET_CLASS (gtk_layout_parent_class)->expose_event (widget, event);
GtkWidget *widget)
{
GtkLayout *layout = GTK_LAYOUT (container);
+ GtkLayoutPriv *priv = layout->priv;
GList *tmp_list;
GtkLayoutChild *child = NULL;
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
child = tmp_list->data;
{
gtk_widget_unparent (widget);
- layout->children = g_list_remove_link (layout->children, tmp_list);
+ priv->children = g_list_remove_link (priv->children, tmp_list);
g_list_free_1 (tmp_list);
g_free (child);
}
gpointer callback_data)
{
GtkLayout *layout = GTK_LAYOUT (container);
+ GtkLayoutPriv *priv = layout->priv;
GtkLayoutChild *child;
GList *tmp_list;
- tmp_list = layout->children;
+ tmp_list = priv->children;
while (tmp_list)
{
child = tmp_list->data;
gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
GtkLayout *layout)
{
- if (layout->freeze_count)
+ GtkLayoutPriv *priv = layout->priv;
+
+ if (priv->freeze_count)
return;
- if (GTK_WIDGET_REALIZED (layout))
+ if (gtk_widget_get_realized (GTK_WIDGET (layout)))
{
- gdk_window_move (layout->bin_window,
- - layout->hadjustment->value,
- - layout->vadjustment->value);
-
- gdk_window_process_updates (layout->bin_window, TRUE);
+ gdk_window_move (priv->bin_window,
+ - priv->hadjustment->value,
+ - priv->vadjustment->value);
+
+ gdk_window_process_updates (priv->bin_window, TRUE);
}
}
-
-#define __GTK_LAYOUT_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff