Modernize GtkSpinner private data access

This commit is contained in:
Daemonratte 2026-04-26 18:56:25 +02:00
commit bb1f0bc0bd

View file

@ -54,15 +54,6 @@
*/
#define GTK_SPINNER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_SPINNER, GtkSpinnerPrivate))
G_DEFINE_TYPE (GtkSpinner, gtk_spinner, GTK_TYPE_DRAWING_AREA);
enum {
PROP_0,
PROP_ACTIVE
};
struct _GtkSpinnerPrivate
{
guint current;
@ -72,6 +63,13 @@ struct _GtkSpinnerPrivate
guint timeout;
};
G_DEFINE_TYPE_WITH_PRIVATE (GtkSpinner, gtk_spinner, GTK_TYPE_DRAWING_AREA)
enum {
PROP_0,
PROP_ACTIVE
};
static void gtk_spinner_class_init (GtkSpinnerClass *klass);
static void gtk_spinner_init (GtkSpinner *spinner);
static void gtk_spinner_dispose (GObject *gobject);
@ -103,7 +101,6 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
GtkWidgetClass *widget_class;
gobject_class = G_OBJECT_CLASS(klass);
g_type_class_add_private (gobject_class, sizeof (GtkSpinnerPrivate));
gobject_class->dispose = gtk_spinner_dispose;
gobject_class->get_property = gtk_spinner_get_property;
gobject_class->set_property = gtk_spinner_set_property;
@ -205,7 +202,7 @@ gtk_spinner_init (GtkSpinner *spinner)
{
GtkSpinnerPrivate *priv;
priv = GTK_SPINNER_GET_PRIVATE (spinner);
priv = gtk_spinner_get_instance_private (spinner);
priv->current = 0;
priv->timeout = 0;