* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+#include "config.h"
#include "gtkcontainer.h"
#include "gtkmisc.h"
#include "gtkintl.h"
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_property (GObject *object,
guint prop_id,
GParamSpec *pspec);
-GType
-gtk_misc_get_type (void)
-{
- static GType misc_type = 0;
-
- if (!misc_type)
- {
- static const GTypeInfo misc_info =
- {
- sizeof (GtkMiscClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_misc_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkMisc),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_misc_init,
- NULL, /* value_table */
- };
-
- misc_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkMisc"),
- &misc_info, G_TYPE_FLAG_ABSTRACT);
- }
-
- return misc_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET)
static void
gtk_misc_class_init (GtkMiscClass *class)
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;
gtk_widget_queue_draw (widget);
}
- 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");
g_object_thaw_notify (G_OBJECT (misc));
}
}
* @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().
+ * Gets the X and Y alignment of the widget within its allocation.
+ * See gtk_misc_set_alignment().
**/
void
gtk_misc_get_alignment (GtkMisc *misc,
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_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");
g_object_thaw_notify (G_OBJECT (misc));
}
}
* @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().
+ * Gets the padding in the X and Y directions of the widget.
+ * See gtk_misc_set_padding().
**/
void
gtk_misc_get_padding (GtkMisc *misc,
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (GTK_IS_MISC (widget));
-
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- if (GTK_WIDGET_NO_WINDOW (widget))
+ if (!gtk_widget_get_has_window (widget))
{
widget->window = gtk_widget_get_parent_window (widget);
g_object_ref (widget->window);