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

fixed: Remove priv pointer

Browse Source
This commit is contained in:
Timm Bäder 2018-06-20 14:24:21 +02:00
parent f26359db13
commit daba1a7eff
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkfixed.c
View File

@ -81,10 +81,10 @@
#include "gtkintl.h"
struct _GtkFixedPrivate
typedef struct
{
GList *children;
};
} GtkFixedPrivate;
enum {
CHILD_PROP_0,
@ -171,9 +171,9 @@ gtk_fixed_child_type (GtkContainer *container)
static void
gtk_fixed_init (GtkFixed *fixed)
{
fixed->priv = gtk_fixed_get_instance_private (fixed);
GtkFixedPrivate *priv = gtk_fixed_get_instance_private (fixed);
fixed->priv->children = NULL;
priv->children = NULL;
gtk_widget_set_has_surface (GTK_WIDGET (fixed), FALSE);
}
@ -195,7 +195,7 @@ static GtkFixedChild*
get_child (GtkFixed *fixed,
GtkWidget *widget)
{
GtkFixedPrivate *priv = fixed->priv;
GtkFixedPrivate *priv = gtk_fixed_get_instance_private (fixed);
GList *children;
for (children = priv->children; children; children = children->next)
@ -226,15 +226,13 @@ gtk_fixed_put (GtkFixed *fixed,
gint x,
gint y)
{
GtkFixedPrivate *priv;
GtkFixedPrivate *priv = gtk_fixed_get_instance_private (fixed);
GtkFixedChild *child_info;
g_return_if_fail (GTK_IS_FIXED (fixed));
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (_gtk_widget_get_parent (widget) == NULL);
priv = fixed->priv;
child_info = g_new (GtkFixedChild, 1);
child_info->widget = widget;
child_info->x = x;
@ -360,7 +358,7 @@ gtk_fixed_measure (GtkWidget *widget,
int *natural_baseline)
{
GtkFixed *fixed = GTK_FIXED (widget);
GtkFixedPrivate *priv = fixed->priv;
GtkFixedPrivate *priv = gtk_fixed_get_instance_private (fixed);
GtkFixedChild *child;
GList *children;
gint child_min, child_nat;
@ -396,7 +394,7 @@ gtk_fixed_size_allocate (GtkWidget *widget,
int baseline)
{
GtkFixed *fixed = GTK_FIXED (widget);
GtkFixedPrivate *priv = fixed->priv;
GtkFixedPrivate *priv = gtk_fixed_get_instance_private (fixed);
GtkFixedChild *child;
GtkAllocation child_allocation;
GtkRequisition child_requisition;
@ -431,7 +429,7 @@ gtk_fixed_remove (GtkContainer *container,
GtkWidget *widget)
{
GtkFixed *fixed = GTK_FIXED (container);
GtkFixedPrivate *priv = fixed->priv;
GtkFixedPrivate *priv = gtk_fixed_get_instance_private (fixed);
GtkFixedChild *child;
GtkWidget *widget_container = GTK_WIDGET (container);
GList *children;
@ -464,7 +462,7 @@ gtk_fixed_forall (GtkContainer *container,
gpointer callback_data)
{
GtkFixed *fixed = GTK_FIXED (container);
GtkFixedPrivate *priv = fixed->priv;
GtkFixedPrivate *priv = gtk_fixed_get_instance_private (fixed);
GtkFixedChild *child;
GList *children;

6
gtk/gtkfixed.h
View File

@ -43,16 +43,12 @@ G_BEGIN_DECLS
#define GTK_FIXED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass))
typedef struct _GtkFixed GtkFixed;
typedef struct _GtkFixedPrivate GtkFixedPrivate;
typedef struct _GtkFixedClass GtkFixedClass;
typedef struct _GtkFixedChild GtkFixedChild;
struct _GtkFixed
{
GtkContainer container;
/*< private >*/
GtkFixedPrivate *priv;
GtkContainer parent_instance;
};
struct _GtkFixedClass