[gtk+] spinner: Remove priv pointer
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] spinner: Remove priv pointer
- Date: Sun, 1 Oct 2017 07:18:48 +0000 (UTC)
commit b5c3c51124188d014dd88d3b2244def97e609921
Author: Timm Bäder <mail baedert org>
Date: Sat Sep 30 20:06:30 2017 +0200
spinner: Remove priv pointer
gtk/gtkspinner.c | 9 +++------
gtk/gtkspinner.h | 4 ----
2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 24a4920..f866031 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -71,6 +71,7 @@ struct _GtkSpinnerPrivate
{
guint active : 1;
};
+typedef struct _GtkSpinnerPrivate GtkSpinnerPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (GtkSpinner, gtk_spinner, GTK_TYPE_WIDGET)
@@ -123,7 +124,7 @@ static void
gtk_spinner_set_active (GtkSpinner *spinner,
gboolean active)
{
- GtkSpinnerPrivate *priv = spinner->priv;
+ GtkSpinnerPrivate *priv = gtk_spinner_get_instance_private (spinner);
active = !!active;
@@ -148,9 +149,7 @@ gtk_spinner_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- GtkSpinnerPrivate *priv;
-
- priv = GTK_SPINNER (object)->priv;
+ GtkSpinnerPrivate *priv = gtk_spinner_get_instance_private (GTK_SPINNER (object));
switch (param_id)
{
@@ -213,8 +212,6 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
static void
gtk_spinner_init (GtkSpinner *spinner)
{
- spinner->priv = gtk_spinner_get_instance_private (spinner);
-
gtk_widget_set_has_window (GTK_WIDGET (spinner), FALSE);
}
diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index 0da77b5..d21f951 100644
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -40,14 +40,10 @@ G_BEGIN_DECLS
typedef struct _GtkSpinner GtkSpinner;
typedef struct _GtkSpinnerClass GtkSpinnerClass;
-typedef struct _GtkSpinnerPrivate GtkSpinnerPrivate;
struct _GtkSpinner
{
GtkWidget parent;
-
- /*< private >*/
- GtkSpinnerPrivate *priv;
};
struct _GtkSpinnerClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]