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

cell renderer spinner: Drop priv pointer

Browse Source
This commit is contained in:
Matthias Clasen 2019-05-26 20:33:38 -04:00
parent 0a41fc5452
commit d20c7e3077
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkcellrendererspinner.c
View File

@ -70,9 +70,6 @@ typedef struct _GtkCellRendererSpinnerPrivate GtkCellRendererSpinnerPrivate;
struct _GtkCellRendererSpinner struct _GtkCellRendererSpinner
{ {
GtkCellRenderer parent; GtkCellRenderer parent;
/*< private >*/
GtkCellRendererSpinnerPrivate *priv;
}; };
struct _GtkCellRendererSpinnerClass struct _GtkCellRendererSpinnerClass
@ -178,9 +175,9 @@ gtk_cell_renderer_spinner_class_init (GtkCellRendererSpinnerClass *klass)
static void static void
gtk_cell_renderer_spinner_init (GtkCellRendererSpinner *cell) gtk_cell_renderer_spinner_init (GtkCellRendererSpinner *cell)
{ {
cell->priv = gtk_cell_renderer_spinner_get_instance_private (cell); GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
cell->priv->pulse = 0; priv->pulse = 0;
cell->priv->icon_size = GTK_ICON_SIZE_INHERIT; priv->icon_size = GTK_ICON_SIZE_INHERIT;
} }
/** /**
@ -201,7 +198,7 @@ static void
gtk_cell_renderer_spinner_update_size (GtkCellRendererSpinner *cell, gtk_cell_renderer_spinner_update_size (GtkCellRendererSpinner *cell,
GtkWidget *widget) GtkWidget *widget)
{ {
GtkCellRendererSpinnerPrivate *priv = cell->priv; GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
GtkStyleContext *context; GtkStyleContext *context;
GtkCssNode *node; GtkCssNode *node;
GtkCssStyle *style; GtkCssStyle *style;
@ -225,7 +222,7 @@ gtk_cell_renderer_spinner_get_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (object); GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (object);
GtkCellRendererSpinnerPrivate *priv = cell->priv; GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
switch (param_id) switch (param_id)
{ {
@ -250,7 +247,7 @@ gtk_cell_renderer_spinner_set_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (object); GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (object);
GtkCellRendererSpinnerPrivate *priv = cell->priv; GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
switch (param_id) switch (param_id)
{ {
@ -290,7 +287,7 @@ gtk_cell_renderer_spinner_get_size (GtkCellRenderer *cellr,
gint *height) gint *height)
{ {
GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (cellr); GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (cellr);
GtkCellRendererSpinnerPrivate *priv = cell->priv; GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
gdouble align; gdouble align;
gint w, h; gint w, h;
gint xpad, ypad; gint xpad, ypad;
@ -411,7 +408,7 @@ gtk_cell_renderer_spinner_snapshot (GtkCellRenderer *cellr,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (cellr); GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (cellr);
GtkCellRendererSpinnerPrivate *priv = cell->priv; GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
GdkRectangle pix_rect; GdkRectangle pix_rect;
GdkRectangle draw_rect; GdkRectangle draw_rect;
gint xpad, ypad; gint xpad, ypad;