callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk/gtkspinner.c: use accessor functions to access GtkWidget

Browse Source
This commit is contained in:
Javier Jardón
2010-08-11 22:54:47 +02:00
parent 4847b9a940
commit 91a49bac5a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkspinner.c
View File

@ -217,14 +217,16 @@ static gboolean
gtk_spinner_expose (GtkWidget *widget, gtk_spinner_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
GtkAllocation allocation;
GtkStateType state_type; GtkStateType state_type;
GtkSpinnerPrivate *priv; GtkSpinnerPrivate *priv;
int width, height; int width, height;
priv = GTK_SPINNER (widget)->priv; priv = GTK_SPINNER (widget)->priv;
width = widget->allocation.width; gtk_widget_get_allocation (widget, &allocation);
height = widget->allocation.height; width = allocation.width;
height = allocation.height;
if ((width < 12) || (height <12)) if ((width < 12) || (height <12))
gtk_widget_set_size_request (widget, 12, 12); gtk_widget_set_size_request (widget, 12, 12);
@ -233,8 +235,8 @@ gtk_spinner_expose (GtkWidget *widget,
if (!gtk_widget_is_sensitive (widget)) if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE; state_type = GTK_STATE_INSENSITIVE;
gtk_paint_spinner (widget->style, gtk_paint_spinner (gtk_widget_get_style (widget),
widget->window, gtk_widget_get_window (widget),
state_type, state_type,
&event->area, &event->area,
widget, widget,
@ -473,6 +475,7 @@ gtk_spinner_accessible_image_get_size (AtkImage *image,
gint *width, gint *width,
gint *height) gint *height)
{ {
GtkAllocation allocation;
GtkWidget *widget; GtkWidget *widget;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
@ -482,8 +485,9 @@ gtk_spinner_accessible_image_get_size (AtkImage *image,
} }
else else
{ {
*width = widget->allocation.width; gtk_widget_get_allocation (widget, &allocation);
*height = widget->allocation.height; *width = allocation.width;
*height = allocation.height;
} }
} }