* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
#include "gdkconfig.h"
#include "gtklayout.h"
-#include "gtksignal.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
+#include "gtkalias.h"
typedef struct _GtkLayoutChild GtkLayoutChild;
CHILD_PROP_Y
};
-static void gtk_layout_class_init (GtkLayoutClass *class);
static void gtk_layout_get_property (GObject *object,
guint prop_id,
GValue *value,
static GObject *gtk_layout_constructor (GType type,
guint n_properties,
GObjectConstructParam *properties);
-static void gtk_layout_init (GtkLayout *layout);
static void gtk_layout_finalize (GObject *object);
static void gtk_layout_realize (GtkWidget *widget);
static void gtk_layout_unrealize (GtkWidget *widget);
GtkAllocation *allocation);
static gint gtk_layout_expose (GtkWidget *widget,
GdkEventExpose *event);
+static void gtk_layout_add (GtkContainer *container,
+ GtkWidget *widget);
static void gtk_layout_remove (GtkContainer *container,
GtkWidget *widget);
static void gtk_layout_forall (GtkContainer *container,
GtkStyle *old_style);
static void gtk_layout_set_adjustment_upper (GtkAdjustment *adj,
- gdouble upper);
+ gdouble upper,
+ gboolean always_emit_changed);
-static GtkWidgetClass *parent_class = NULL;
+G_DEFINE_TYPE (GtkLayout, gtk_layout, GTK_TYPE_CONTAINER)
/* Public interface
*/
/**
* 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
return GTK_WIDGET (layout);
}
+/**
+ * gtk_layout_get_bin_window:
+ * @layout: a #GtkLayout
+ *
+ * Retrieve the bin window of the layout used for drawing operations.
+ *
+ * Return value: a #GdkWindow
+ *
+ * Since: 2.14
+ **/
+GdkWindow*
+gtk_layout_get_bin_window (GtkLayout *layout)
+{
+ g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
+
+ return layout->bin_window;
+}
+
/**
* gtk_layout_get_hadjustment:
* @layout: a #GtkLayout
if (layout->hadjustment && (layout->hadjustment != hadj))
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (layout->hadjustment), layout);
- gtk_object_unref (GTK_OBJECT (layout->hadjustment));
+ g_signal_handlers_disconnect_by_func (layout->hadjustment,
+ gtk_layout_adjustment_changed,
+ layout);
+ g_object_unref (layout->hadjustment);
}
if (layout->vadjustment && (layout->vadjustment != vadj))
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (layout->vadjustment), layout);
- gtk_object_unref (GTK_OBJECT (layout->vadjustment));
+ g_signal_handlers_disconnect_by_func (layout->vadjustment,
+ gtk_layout_adjustment_changed,
+ layout);
+ g_object_unref (layout->vadjustment);
}
if (layout->hadjustment != hadj)
{
layout->hadjustment = hadj;
- gtk_object_ref (GTK_OBJECT (layout->hadjustment));
- gtk_object_sink (GTK_OBJECT (layout->hadjustment));
- gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width);
+ g_object_ref_sink (layout->hadjustment);
+ gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE);
- gtk_signal_connect (GTK_OBJECT (layout->hadjustment), "value_changed",
- (GtkSignalFunc) gtk_layout_adjustment_changed,
- layout);
+ g_signal_connect (layout->hadjustment, "value-changed",
+ G_CALLBACK (gtk_layout_adjustment_changed),
+ layout);
need_adjust = TRUE;
}
if (layout->vadjustment != vadj)
{
layout->vadjustment = vadj;
- gtk_object_ref (GTK_OBJECT (layout->vadjustment));
- gtk_object_sink (GTK_OBJECT (layout->vadjustment));
- gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height);
+ g_object_ref_sink (layout->vadjustment);
+ gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE);
- gtk_signal_connect (GTK_OBJECT (layout->vadjustment), "value_changed",
- (GtkSignalFunc) gtk_layout_adjustment_changed,
- layout);
+ g_signal_connect (layout->vadjustment, "value-changed",
+ G_CALLBACK (gtk_layout_adjustment_changed),
+ layout);
need_adjust = TRUE;
}
{
GtkLayout *layout = GTK_LAYOUT (object);
- gtk_object_unref (GTK_OBJECT (layout->hadjustment));
- gtk_object_unref (GTK_OBJECT (layout->vadjustment));
+ g_object_unref (layout->hadjustment);
+ g_object_unref (layout->vadjustment);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ 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_vadjustment:
* @layout: a #GtkLayout
- * @adjustment: new scroll adjustment
+ * @adjustment: (allow-none): new scroll adjustment
*
* Sets the vertical scroll adjustment for the layout.
*
gint y)
{
GtkLayoutChild *child;
-
- g_return_if_fail (GTK_IS_LAYOUT (layout));
- g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (widget->parent == GTK_WIDGET (layout));
-
+
child = get_child (layout, widget);
g_assert (child);
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);
}
/**
static void
gtk_layout_set_adjustment_upper (GtkAdjustment *adj,
- gdouble upper)
+ gdouble upper,
+ gboolean always_emit_changed)
{
+ gboolean changed = FALSE;
+ gboolean value_changed = FALSE;
+
+ gdouble min = MAX (0., upper - adj->page_size);
+
if (upper != adj->upper)
{
- gdouble min = MAX (0., upper - adj->page_size);
- gboolean value_changed = FALSE;
-
adj->upper = upper;
+ changed = TRUE;
+ }
- if (adj->value > min)
- {
- adj->value = min;
- value_changed = TRUE;
- }
-
- gtk_signal_emit_by_name (GTK_OBJECT (adj), "changed");
- if (value_changed)
- gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
+ if (adj->value > min)
+ {
+ adj->value = min;
+ value_changed = TRUE;
}
+
+ if (changed || always_emit_changed)
+ gtk_adjustment_changed (adj);
+ if (value_changed)
+ gtk_adjustment_value_changed (adj);
}
/**
GtkWidget *widget;
g_return_if_fail (GTK_IS_LAYOUT (layout));
-
+
widget = GTK_WIDGET (layout);
g_object_freeze_notify (G_OBJECT (layout));
g_object_thaw_notify (G_OBJECT (layout));
if (layout->hadjustment)
- gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width);
+ gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width, FALSE);
if (layout->vadjustment)
- gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height);
+ gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height, FALSE);
if (GTK_WIDGET_REALIZED (layout))
{
/**
* 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
g_return_if_fail (GTK_IS_LAYOUT (layout));
if (layout->freeze_count)
- if (!(--layout->freeze_count))
- gtk_widget_draw (GTK_WIDGET (layout), NULL);
-}
-
-/* Basic Object handling procedures
- */
-GtkType
-gtk_layout_get_type (void)
-{
- static GtkType layout_type = 0;
-
- if (!layout_type)
{
- static const GTypeInfo layout_info =
- {
- sizeof (GtkLayoutClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_layout_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkLayout),
- 16, /* n_preallocs */
- (GInstanceInitFunc) gtk_layout_init,
- };
-
- layout_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkLayout", &layout_info, 0);
+ if (!(--layout->freeze_count))
+ {
+ gtk_widget_queue_draw (GTK_WIDGET (layout));
+ gdk_window_process_updates (GTK_WIDGET (layout)->window, TRUE);
+ }
}
- return layout_type;
}
+/* Basic Object handling procedures
+ */
static void
gtk_layout_class_init (GtkLayoutClass *class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
gobject_class = (GObjectClass*) class;
- object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
container_class = (GtkContainerClass*) class;
- parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
-
gobject_class->set_property = gtk_layout_set_property;
gobject_class->get_property = gtk_layout_get_property;
gobject_class->finalize = gtk_layout_finalize;
gtk_container_class_install_child_property (container_class,
CHILD_PROP_X,
g_param_spec_int ("x",
- _("X position"),
- _("X position of child widget"),
+ P_("X position"),
+ P_("X position of child widget"),
G_MININT,
G_MAXINT,
0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
CHILD_PROP_Y,
g_param_spec_int ("y",
- _("Y position"),
- _("Y position of child widget"),
+ P_("Y position"),
+ P_("Y position of child widget"),
G_MININT,
G_MAXINT,
0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HADJUSTMENT,
g_param_spec_object ("hadjustment",
- _("Horizontal adjustment"),
- _("The GtkAdjustment for the horizontal position."),
+ P_("Horizontal adjustment"),
+ P_("The GtkAdjustment for the horizontal position"),
GTK_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VADJUSTMENT,
g_param_spec_object ("vadjustment",
- _("Vertical adjustment"),
- _("The GtkAdjustment for the vertical position."),
+ P_("Vertical adjustment"),
+ P_("The GtkAdjustment for the vertical position"),
GTK_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_WIDTH,
g_param_spec_uint ("width",
- _("Width"),
- _("The width of the layout."),
+ P_("Width"),
+ P_("The width of the layout"),
0,
G_MAXINT,
100,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HEIGHT,
g_param_spec_uint ("height",
- _("Height"),
- _("The height of the layout."),
+ P_("Height"),
+ P_("The height of the layout"),
0,
G_MAXINT,
100,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
widget_class->realize = gtk_layout_realize;
widget_class->unrealize = gtk_layout_unrealize;
widget_class->map = gtk_layout_map;
widget_class->expose_event = gtk_layout_expose;
widget_class->style_set = gtk_layout_style_set;
+ container_class->add = gtk_layout_add;
container_class->remove = gtk_layout_remove;
container_class->forall = gtk_layout_forall;
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 =
- gtk_signal_new ("set_scroll_adjustments",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkLayoutClass, set_scroll_adjustments),
- _gtk_marshal_VOID__OBJECT_OBJECT,
- GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+ g_signal_new (I_("set-scroll-adjustments"),
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkLayoutClass, set_scroll_adjustments),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT_OBJECT,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_ADJUSTMENT,
+ GTK_TYPE_ADJUSTMENT);
}
static void
GObject *object;
GtkAdjustment *hadj, *vadj;
- object = G_OBJECT_CLASS (parent_class)->constructor (type,
- n_properties,
- properties);
+ object = G_OBJECT_CLASS (gtk_layout_parent_class)->constructor (type,
+ n_properties,
+ properties);
layout = GTK_LAYOUT (object);
static void
gtk_layout_realize (GtkWidget *widget)
{
+ GtkLayout *layout = GTK_LAYOUT (widget);
GList *tmp_list;
- GtkLayout *layout;
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (GTK_IS_LAYOUT (widget));
-
- layout = GTK_LAYOUT (widget);
GTK_WIDGET_SET_FLAGS (layout, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD;
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
+ gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
gdk_window_set_user_data (widget->window, widget);
attributes.x = - layout->hadjustment->value,
gdk_window_set_user_data (layout->bin_window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
gtk_style_set_background (widget->style, layout->bin_window, GTK_STATE_NORMAL);
tmp_list = layout->children;
}
static void
-gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
+gtk_layout_style_set (GtkWidget *widget,
+ GtkStyle *old_style)
{
- if (GTK_WIDGET_CLASS (parent_class)->style_set)
- (* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, old_style);
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
if (GTK_WIDGET_REALIZED (widget))
{
}
}
-static void
+static void
gtk_layout_map (GtkWidget *widget)
{
+ GtkLayout *layout = GTK_LAYOUT (widget);
GList *tmp_list;
- GtkLayout *layout;
-
- g_return_if_fail (GTK_IS_LAYOUT (widget));
-
- layout = GTK_LAYOUT (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
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);
}
}
static void
gtk_layout_unrealize (GtkWidget *widget)
{
- GtkLayout *layout;
-
- g_return_if_fail (GTK_IS_LAYOUT (widget));
-
- layout = GTK_LAYOUT (widget);
+ GtkLayout *layout = GTK_LAYOUT (widget);
gdk_window_set_user_data (layout->bin_window, NULL);
gdk_window_destroy (layout->bin_window);
layout->bin_window = NULL;
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize (widget);
}
static void
gtk_layout_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
+ GtkLayout *layout = GTK_LAYOUT (widget);
GList *tmp_list;
- GtkLayout *layout;
-
- g_return_if_fail (GTK_IS_LAYOUT (widget));
-
- layout = GTK_LAYOUT (widget);
requisition->width = 0;
requisition->height = 0;
gtk_layout_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
+ GtkLayout *layout = GTK_LAYOUT (widget);
GList *tmp_list;
- GtkLayout *layout;
-
- g_return_if_fail (GTK_IS_LAYOUT (widget));
widget->allocation = *allocation;
-
- layout = GTK_LAYOUT (widget);
tmp_list = layout->children;
layout->hadjustment->page_size = allocation->width;
layout->hadjustment->page_increment = allocation->width * 0.9;
layout->hadjustment->lower = 0;
- layout->hadjustment->upper = MAX (allocation->width, layout->width);
- gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
+ /* set_adjustment_upper() emits ::changed */
+ gtk_layout_set_adjustment_upper (layout->hadjustment, MAX (allocation->width, layout->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_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");
+ gtk_layout_set_adjustment_upper (layout->vadjustment, MAX (allocation->height, layout->height), TRUE);
}
static gint
-gtk_layout_expose (GtkWidget *widget, GdkEventExpose *event)
+gtk_layout_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
- GtkLayout *layout;
-
- g_return_val_if_fail (GTK_IS_LAYOUT (widget), FALSE);
-
- layout = GTK_LAYOUT (widget);
+ GtkLayout *layout = GTK_LAYOUT (widget);
if (event->window != layout->bin_window)
return FALSE;
-
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+
+ GTK_WIDGET_CLASS (gtk_layout_parent_class)->expose_event (widget, event);
return FALSE;
}
-/* Container method
+/* Container methods
*/
+static void
+gtk_layout_add (GtkContainer *container,
+ GtkWidget *widget)
+{
+ gtk_layout_put (GTK_LAYOUT (container), widget, 0, 0);
+}
+
static void
gtk_layout_remove (GtkContainer *container,
GtkWidget *widget)
{
+ GtkLayout *layout = GTK_LAYOUT (container);
GList *tmp_list;
- GtkLayout *layout;
GtkLayoutChild *child = NULL;
-
- g_return_if_fail (GTK_IS_LAYOUT (container));
-
- layout = GTK_LAYOUT (container);
tmp_list = layout->children;
while (tmp_list)
GtkCallback callback,
gpointer callback_data)
{
- GtkLayout *layout;
+ GtkLayout *layout = GTK_LAYOUT (container);
GtkLayoutChild *child;
GList *tmp_list;
- g_return_if_fail (GTK_IS_LAYOUT (container));
- g_return_if_fail (callback != NULL);
-
- layout = GTK_LAYOUT (container);
-
tmp_list = layout->children;
while (tmp_list)
{
gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
GtkLayout *layout)
{
- GtkWidget *widget;
-
- widget = GTK_WIDGET (layout);
-
if (layout->freeze_count)
return;
gdk_window_process_updates (layout->bin_window, TRUE);
}
}
+
+#define __GTK_LAYOUT_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff