AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

separator: Remove priv pointer

Browse Source
This commit is contained in:
Timm Bäder 2018-03-07 20:37:00 +01:00
parent faabb808be
commit 28cda7f516
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkseparator.c
View File

@ -48,6 +48,7 @@
*/
typedef struct _GtkSeparatorPrivate GtkSeparatorPrivate;
struct _GtkSeparatorPrivate
{
GtkOrientation orientation;
@ -72,14 +73,14 @@ gtk_separator_set_property (GObject *object,
GParamSpec *pspec)
{
GtkSeparator *separator = GTK_SEPARATOR (object);
GtkSeparatorPrivate *private = separator->priv;
GtkSeparatorPrivate *priv = gtk_separator_get_instance_private (separator);
switch (prop_id)
{
case PROP_ORIENTATION:
if (private->orientation != g_value_get_enum (value))
if (priv->orientation != g_value_get_enum (value))
{
private->orientation = g_value_get_enum (value);
priv->orientation = g_value_get_enum (value);
_gtk_orientable_set_style_classes (GTK_ORIENTABLE (object));
gtk_widget_queue_resize (GTK_WIDGET (object));
g_object_notify_by_pspec (object, pspec);
@ -98,12 +99,12 @@ gtk_separator_get_property (GObject *object,
GParamSpec *pspec)
{
GtkSeparator *separator = GTK_SEPARATOR (object);
GtkSeparatorPrivate *private = separator->priv;
GtkSeparatorPrivate *priv = gtk_separator_get_instance_private (separator);
switch (prop_id)
{
case PROP_ORIENTATION:
g_value_set_enum (value, private->orientation);
g_value_set_enum (value, priv->orientation);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -114,8 +115,9 @@ gtk_separator_get_property (GObject *object,
static void
gtk_separator_init (GtkSeparator *separator)
{
separator->priv = gtk_separator_get_instance_private (separator);
separator->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
GtkSeparatorPrivate *priv = gtk_separator_get_instance_private (separator);
priv->orientation = GTK_ORIENTATION_HORIZONTAL;
gtk_widget_set_has_window (GTK_WIDGET (separator), FALSE);

5
gtk/gtkseparator.h
View File

@ -44,14 +44,11 @@ G_BEGIN_DECLS
typedef struct _GtkSeparator GtkSeparator;
typedef struct _GtkSeparatorPrivate GtkSeparatorPrivate;
typedef struct _GtkSeparatorClass GtkSeparatorClass;
struct _GtkSeparator
{
GtkWidget widget;
GtkSeparatorPrivate *priv;
GtkWidget parent_instance;
};
struct _GtkSeparatorClass