Commit c6a44d84 authored by Javier Jardón's avatar Javier Jardón

gtk/gtkseparator: Do not use GET_PRIVATE macro all the time

Use a private pointer instead
parent 8d983a45
...@@ -42,21 +42,16 @@ ...@@ -42,21 +42,16 @@
*/ */
enum { struct _GtkSeparatorPriv
PROP_0,
PROP_ORIENTATION
};
typedef struct _GtkSeparatorPrivate GtkSeparatorPrivate;
struct _GtkSeparatorPrivate
{ {
GtkOrientation orientation; GtkOrientation orientation;
}; };
#define GTK_SEPARATOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_SEPARATOR, GtkSeparatorPrivate))
enum {
PROP_0,
PROP_ORIENTATION
};
static void gtk_separator_set_property (GObject *object, static void gtk_separator_set_property (GObject *object,
guint prop_id, guint prop_id,
...@@ -94,14 +89,19 @@ gtk_separator_class_init (GtkSeparatorClass *class) ...@@ -94,14 +89,19 @@ gtk_separator_class_init (GtkSeparatorClass *class)
PROP_ORIENTATION, PROP_ORIENTATION,
"orientation"); "orientation");
g_type_class_add_private (object_class, sizeof (GtkSeparatorPrivate)); g_type_class_add_private (object_class, sizeof (GtkSeparatorPriv));
} }
static void static void
gtk_separator_init (GtkSeparator *separator) gtk_separator_init (GtkSeparator *separator)
{ {
GtkWidget *widget = GTK_WIDGET (separator); GtkWidget *widget = GTK_WIDGET (separator);
GtkSeparatorPrivate *private = GTK_SEPARATOR_GET_PRIVATE (separator); GtkSeparatorPriv *private;
separator->priv = G_TYPE_INSTANCE_GET_PRIVATE (separator,
GTK_TYPE_SEPARATOR,
GtkSeparatorPriv);
private = separator->priv;
gtk_widget_set_has_window (GTK_WIDGET (separator), FALSE); gtk_widget_set_has_window (GTK_WIDGET (separator), FALSE);
...@@ -117,7 +117,8 @@ gtk_separator_set_property (GObject *object, ...@@ -117,7 +117,8 @@ gtk_separator_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkSeparatorPrivate *private = GTK_SEPARATOR_GET_PRIVATE (object); GtkSeparator *separator = GTK_SEPARATOR (object);
GtkSeparatorPriv *private = separator->priv;
switch (prop_id) switch (prop_id)
{ {
...@@ -137,7 +138,8 @@ gtk_separator_get_property (GObject *object, ...@@ -137,7 +138,8 @@ gtk_separator_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkSeparatorPrivate *private = GTK_SEPARATOR_GET_PRIVATE (object); GtkSeparator *separator = GTK_SEPARATOR (object);
GtkSeparatorPriv *private = separator->priv;
switch (prop_id) switch (prop_id)
{ {
...@@ -154,7 +156,8 @@ static void ...@@ -154,7 +156,8 @@ static void
gtk_separator_size_request (GtkWidget *widget, gtk_separator_size_request (GtkWidget *widget,
GtkRequisition *requisition) GtkRequisition *requisition)
{ {
GtkSeparatorPrivate *private = GTK_SEPARATOR_GET_PRIVATE (widget); GtkSeparator *separator = GTK_SEPARATOR (widget);
GtkSeparatorPriv *private = separator->priv;
gboolean wide_separators; gboolean wide_separators;
gint separator_width; gint separator_width;
gint separator_height; gint separator_height;
...@@ -188,7 +191,8 @@ static gboolean ...@@ -188,7 +191,8 @@ static gboolean
gtk_separator_expose (GtkWidget *widget, gtk_separator_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
GtkSeparatorPrivate *private = GTK_SEPARATOR_GET_PRIVATE (widget); GtkSeparator *separator = GTK_SEPARATOR (widget);
GtkSeparatorPriv *private = separator->priv;
gboolean wide_separators; gboolean wide_separators;
gint separator_width; gint separator_width;
gint separator_height; gint separator_height;
......
...@@ -46,11 +46,14 @@ G_BEGIN_DECLS ...@@ -46,11 +46,14 @@ G_BEGIN_DECLS
typedef struct _GtkSeparator GtkSeparator; typedef struct _GtkSeparator GtkSeparator;
typedef struct _GtkSeparatorPriv GtkSeparatorPriv;
typedef struct _GtkSeparatorClass GtkSeparatorClass; typedef struct _GtkSeparatorClass GtkSeparatorClass;
struct _GtkSeparator struct _GtkSeparator
{ {
GtkWidget widget; GtkWidget widget;
GtkSeparatorPriv *priv;
}; };
struct _GtkSeparatorClass struct _GtkSeparatorClass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment