* 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
+ * You should have received a copy of the GNU Lesser 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.
*/
+
+/*
+ * 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/.
+ */
+
+#include "config.h"
#include "gtkcontainer.h"
#include "gtkmisc.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
enum {
- ARG_0,
- ARG_XALIGN,
- ARG_YALIGN,
- ARG_XPAD,
- ARG_YPAD
+ PROP_0,
+ PROP_XALIGN,
+ PROP_YALIGN,
+ PROP_XPAD,
+ PROP_YPAD
};
-static void gtk_misc_class_init (GtkMiscClass *klass);
-static void gtk_misc_init (GtkMisc *misc);
-static void gtk_misc_realize (GtkWidget *widget);
-static void gtk_misc_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-static void gtk_misc_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-
-
-GtkType
-gtk_misc_get_type (void)
-{
- static GtkType misc_type = 0;
+static void gtk_misc_realize (GtkWidget *widget);
+static void gtk_misc_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_misc_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
- if (!misc_type)
- {
- GtkTypeInfo misc_info =
- {
- "GtkMisc",
- sizeof (GtkMisc),
- sizeof (GtkMiscClass),
- (GtkClassInitFunc) gtk_misc_class_init,
- (GtkObjectInitFunc) gtk_misc_init,
- /* reversed_1 */ NULL,
- /* reversed_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- misc_type = gtk_type_unique (GTK_TYPE_WIDGET, &misc_info);
- }
- return misc_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET)
static void
gtk_misc_class_init (GtkMiscClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- object_class = (GtkObjectClass*) class;
+ gobject_class = G_OBJECT_CLASS (class);
widget_class = (GtkWidgetClass*) class;
- gtk_object_add_arg_type ("GtkMisc::xalign", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_XALIGN);
- gtk_object_add_arg_type ("GtkMisc::yalign", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_YALIGN);
- gtk_object_add_arg_type ("GtkMisc::xpad", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_XPAD);
- gtk_object_add_arg_type ("GtkMisc::ypad", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_YPAD);
-
- object_class->set_arg = gtk_misc_set_arg;
- object_class->get_arg = gtk_misc_get_arg;
+ gobject_class->set_property = gtk_misc_set_property;
+ gobject_class->get_property = gtk_misc_get_property;
widget_class->realize = gtk_misc_realize;
+
+ g_object_class_install_property (gobject_class,
+ PROP_XALIGN,
+ g_param_spec_float ("xalign",
+ P_("X align"),
+ P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."),
+ 0.0,
+ 1.0,
+ 0.5,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_YALIGN,
+ g_param_spec_float ("yalign",
+ P_("Y align"),
+ P_("The vertical alignment, from 0 (top) to 1 (bottom)"),
+ 0.0,
+ 1.0,
+ 0.5,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_XPAD,
+ g_param_spec_int ("xpad",
+ P_("X pad"),
+ P_("The amount of space to add on the left and right of the widget, in pixels"),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_YPAD,
+ g_param_spec_int ("ypad",
+ P_("Y pad"),
+ P_("The amount of space to add on the top and bottom of the widget, in pixels"),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
}
static void
gtk_misc_init (GtkMisc *misc)
{
- GTK_WIDGET_SET_FLAGS (misc, GTK_BASIC);
-
misc->xalign = 0.5;
misc->yalign = 0.5;
misc->xpad = 0;
}
static void
-gtk_misc_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id)
+gtk_misc_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkMisc *misc;
misc = GTK_MISC (object);
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_XALIGN:
- gtk_misc_set_alignment (misc, GTK_VALUE_DOUBLE (*arg), misc->yalign);
+ case PROP_XALIGN:
+ gtk_misc_set_alignment (misc, g_value_get_float (value), misc->yalign);
break;
- case ARG_YALIGN:
- gtk_misc_set_alignment (misc, misc->xalign, GTK_VALUE_DOUBLE (*arg));
+ case PROP_YALIGN:
+ gtk_misc_set_alignment (misc, misc->xalign, g_value_get_float (value));
break;
- case ARG_XPAD:
- gtk_misc_set_padding (misc, GTK_VALUE_INT (*arg), misc->ypad);
+ case PROP_XPAD:
+ gtk_misc_set_padding (misc, g_value_get_int (value), misc->ypad);
break;
- case ARG_YPAD:
- gtk_misc_set_padding (misc, misc->xpad, GTK_VALUE_INT (*arg));
+ case PROP_YPAD:
+ gtk_misc_set_padding (misc, misc->xpad, g_value_get_int (value));
break;
default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
-gtk_misc_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id)
+gtk_misc_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkMisc *misc;
misc = GTK_MISC (object);
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_XALIGN:
- GTK_VALUE_DOUBLE (*arg) = misc->xalign;
+ case PROP_XALIGN:
+ g_value_set_float (value, misc->xalign);
break;
- case ARG_YALIGN:
- GTK_VALUE_DOUBLE (*arg) = misc->yalign;
+ case PROP_YALIGN:
+ g_value_set_float (value, misc->yalign);
break;
- case ARG_XPAD:
- GTK_VALUE_INT (*arg) = misc->xpad;
+ case PROP_XPAD:
+ g_value_set_int (value, misc->xpad);
break;
- case ARG_YPAD:
- GTK_VALUE_INT (*arg) = misc->ypad;
+ case PROP_YPAD:
+ g_value_set_int (value, misc->ypad);
break;
default:
- arg->type = GTK_TYPE_INVALID;
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
gfloat xalign,
gfloat yalign)
{
- g_return_if_fail (misc != NULL);
g_return_if_fail (GTK_IS_MISC (misc));
if (xalign < 0.0)
if ((xalign != misc->xalign) || (yalign != misc->yalign))
{
+ g_object_freeze_notify (G_OBJECT (misc));
+ if (xalign != misc->xalign)
+ g_object_notify (G_OBJECT (misc), "xalign");
+
+ if (yalign != misc->yalign)
+ g_object_notify (G_OBJECT (misc), "yalign");
+
misc->xalign = xalign;
misc->yalign = yalign;
GtkWidget *widget;
widget = GTK_WIDGET (misc);
- gdk_window_clear_area (widget->window,
- widget->allocation.x,
- widget->allocation.y,
- widget->allocation.width,
- widget->allocation.height);
- gtk_widget_queue_draw (GTK_WIDGET (misc));
+ gtk_widget_queue_draw (widget);
}
+
+ g_object_thaw_notify (G_OBJECT (misc));
}
}
+/**
+ * gtk_misc_get_alignment:
+ * @misc: a #GtkMisc
+ * @xalign: location to store X alignment of @misc, or %NULL
+ * @yalign: location to store Y alignment of @misc, or %NULL
+ *
+ * Gets the X and Y alignment of the widget within its allocation.
+ * See gtk_misc_set_alignment().
+ **/
+void
+gtk_misc_get_alignment (GtkMisc *misc,
+ gfloat *xalign,
+ gfloat *yalign)
+{
+ g_return_if_fail (GTK_IS_MISC (misc));
+
+ if (xalign)
+ *xalign = misc->xalign;
+ if (yalign)
+ *yalign = misc->yalign;
+}
+
void
gtk_misc_set_padding (GtkMisc *misc,
gint xpad,
{
GtkRequisition *requisition;
- g_return_if_fail (misc != NULL);
g_return_if_fail (GTK_IS_MISC (misc));
if (xpad < 0)
if ((xpad != misc->xpad) || (ypad != misc->ypad))
{
+ g_object_freeze_notify (G_OBJECT (misc));
+ if (xpad != misc->xpad)
+ g_object_notify (G_OBJECT (misc), "xpad");
+
+ if (ypad != misc->ypad)
+ g_object_notify (G_OBJECT (misc), "ypad");
+
requisition = &(GTK_WIDGET (misc)->requisition);
requisition->width -= misc->xpad * 2;
requisition->height -= misc->ypad * 2;
if (GTK_WIDGET_DRAWABLE (misc))
gtk_widget_queue_resize (GTK_WIDGET (misc));
+
+ g_object_thaw_notify (G_OBJECT (misc));
}
}
+/**
+ * gtk_misc_get_padding:
+ * @misc: a #GtkMisc
+ * @xpad: location to store padding in the X direction, or %NULL
+ * @ypad: location to store padding in the Y direction, or %NULL
+ *
+ * Gets the padding in the X and Y directions of the widget.
+ * See gtk_misc_set_padding().
+ **/
+void
+gtk_misc_get_padding (GtkMisc *misc,
+ gint *xpad,
+ gint *ypad)
+{
+ g_return_if_fail (GTK_IS_MISC (misc));
+
+ if (xpad)
+ *xpad = misc->xpad;
+ if (ypad)
+ *ypad = misc->ypad;
+}
+
static void
gtk_misc_realize (GtkWidget *widget)
{
- GtkMisc *misc;
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_MISC (widget));
-
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- misc = GTK_MISC (widget);
- if (GTK_WIDGET_NO_WINDOW (widget))
+ if (!gtk_widget_get_has_window (widget))
{
widget->window = gtk_widget_get_parent_window (widget);
- gdk_window_ref (widget->window);
+ g_object_ref (widget->window);
widget->style = gtk_style_attach (widget->style, widget->window);
}
else
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
}
}
+
+#define __GTK_MISC_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff