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

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

Browse Source
This commit is contained in:
Javier Jardón
2010-08-11 23:00:21 +02:00
parent 5533264958
commit 29044f0f0e
1 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
gtk/gtkspinbutton.c
View File

@ -582,15 +582,20 @@ gtk_spin_button_realize (GtkWidget *widget)
{ {
GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget); GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
GtkSpinButtonPrivate *priv = spin_button->priv; GtkSpinButtonPrivate *priv = spin_button->priv;
GdkWindowAttr attributes; GtkAllocation allocation;
GtkRequisition requisition; GtkRequisition requisition;
GtkStyle *style;
GdkWindowAttr attributes;
gint attributes_mask; gint attributes_mask;
gboolean return_val; gboolean return_val;
gint arrow_size; gint arrow_size;
style = gtk_widget_get_style (widget);
arrow_size = spin_button_get_arrow_size (spin_button); arrow_size = spin_button_get_arrow_size (spin_button);
gtk_size_request_get_size (GTK_SIZE_REQUEST (spin_button), &requisition, NULL); gtk_size_request_get_size (GTK_SIZE_REQUEST (spin_button), &requisition, NULL);
gtk_widget_get_allocation (widget, &allocation);
gtk_widget_set_events (widget, gtk_widget_get_events (widget) | gtk_widget_set_events (widget, gtk_widget_get_events (widget) |
GDK_KEY_RELEASE_MASK); GDK_KEY_RELEASE_MASK);
@ -607,17 +612,17 @@ gtk_spin_button_realize (GtkWidget *widget)
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
attributes.x = (widget->allocation.width - arrow_size - attributes.x = allocation.width - arrow_size - 2 * style->xthickness;
2 * widget->style->xthickness); attributes.y = (allocation.height - requisition.height) / 2;
attributes.y = (widget->allocation.height - requisition.height) / 2; attributes.width = arrow_size + 2 * style->xthickness;
attributes.width = arrow_size + 2 * widget->style->xthickness;
attributes.height = requisition.height; attributes.height = requisition.height;
priv->panel = gdk_window_new (widget->window, priv->panel = gdk_window_new (gtk_widget_get_window (widget),
&attributes, attributes_mask); &attributes, attributes_mask);
gdk_window_set_user_data (priv->panel, widget); gdk_window_set_user_data (priv->panel, widget);
gtk_style_set_background (widget->style, priv->panel, GTK_STATE_NORMAL); gtk_style_set_background (style,
priv->panel, GTK_STATE_NORMAL);
return_val = FALSE; return_val = FALSE;
g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val); g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val);
@ -673,8 +678,11 @@ gtk_spin_button_size_request (GtkWidget *widget,
GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget); GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
GtkSpinButtonPrivate *priv = spin_button->priv; GtkSpinButtonPrivate *priv = spin_button->priv;
GtkEntry *entry = GTK_ENTRY (widget); GtkEntry *entry = GTK_ENTRY (widget);
GtkStyle *style;
gint arrow_size; gint arrow_size;
style = gtk_widget_get_style (widget);
arrow_size = spin_button_get_arrow_size (spin_button); arrow_size = spin_button_get_arrow_size (spin_button);
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_request (widget, requisition); GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_request (widget, requisition);
@ -700,7 +708,7 @@ gtk_spin_button_size_request (GtkWidget *widget,
context = gtk_widget_get_pango_context (widget); context = gtk_widget_get_pango_context (widget);
metrics = pango_context_get_metrics (context, metrics = pango_context_get_metrics (context,
widget->style->font_desc, style->font_desc,
pango_context_get_language (context)); pango_context_get_language (context));
digit_width = pango_font_metrics_get_approximate_digit_width (metrics); digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
@ -730,7 +738,7 @@ gtk_spin_button_size_request (GtkWidget *widget,
requisition->width = width + xborder * 2 + inner_border.left + inner_border.right; requisition->width = width + xborder * 2 + inner_border.left + inner_border.right;
} }
requisition->width += arrow_size + 2 * widget->style->xthickness; requisition->width += arrow_size + 2 * style->xthickness;
} }
static void static void
@ -739,17 +747,17 @@ gtk_spin_button_size_allocate (GtkWidget *widget,
{ {
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget); GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
GtkSpinButtonPrivate *priv = spin->priv; GtkSpinButtonPrivate *priv = spin->priv;
GtkRequisition requisition;
GtkAllocation panel_allocation; GtkAllocation panel_allocation;
GtkRequisition requisition;
gint arrow_size; gint arrow_size;
gint panel_width; gint panel_width;
arrow_size = spin_button_get_arrow_size (spin); arrow_size = spin_button_get_arrow_size (spin);
panel_width = arrow_size + 2 * widget->style->xthickness; panel_width = arrow_size + 2 * gtk_widget_get_style (widget)->xthickness;
gtk_size_request_get_size (GTK_SIZE_REQUEST (widget), &requisition, NULL); gtk_size_request_get_size (GTK_SIZE_REQUEST (widget), &requisition, NULL);
widget->allocation = *allocation; gtk_widget_set_allocation (widget, allocation);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
panel_allocation.x = 0; panel_allocation.x = 0;
@ -800,7 +808,7 @@ gtk_spin_button_expose (GtkWidget *widget,
gdk_drawable_get_size (priv->panel, &width, &height); gdk_drawable_get_size (priv->panel, &width, &height);
gtk_paint_box (widget->style, priv->panel, gtk_paint_box (gtk_widget_get_style (widget), priv->panel,
state, shadow_type, state, shadow_type,
&event->area, widget, "spinbutton", &event->area, widget, "spinbutton",
0, 0, width, height); 0, 0, width, height);
@ -850,6 +858,7 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
GtkSpinButtonPrivate *priv; GtkSpinButtonPrivate *priv;
GtkStateType state_type; GtkStateType state_type;
GtkShadowType shadow_type; GtkShadowType shadow_type;
GtkStyle *style;
GtkWidget *widget; GtkWidget *widget;
gint x; gint x;
gint y; gint y;
@ -866,10 +875,11 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
{ {
GtkRequisition requisition; GtkRequisition requisition;
width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; style = gtk_widget_get_style (widget);
gtk_size_request_get_size (GTK_SIZE_REQUEST (widget), &requisition, NULL); gtk_size_request_get_size (GTK_SIZE_REQUEST (widget), &requisition, NULL);
width = spin_button_get_arrow_size (spin_button) + 2 * style->xthickness;
if (arrow_type == GTK_ARROW_UP) if (arrow_type == GTK_ARROW_UP)
{ {
x = 0; x = 0;
@ -913,7 +923,7 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
} }
} }
gtk_paint_box (widget->style, priv->panel, gtk_paint_box (style, priv->panel,
state_type, shadow_type, state_type, shadow_type,
area, widget, area, widget,
(arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
@ -949,7 +959,7 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
height = h; height = h;
width = w; width = w;
gtk_paint_arrow (widget->style, priv->panel, gtk_paint_arrow (style, priv->panel,
state_type, shadow_type, state_type, shadow_type,
area, widget, "spinbutton", area, widget, "spinbutton",
arrow_type, TRUE, arrow_type, TRUE,
@ -1050,7 +1060,8 @@ gtk_spin_button_style_set (GtkWidget *widget,
GtkSpinButtonPrivate *priv = spin->priv; GtkSpinButtonPrivate *priv = spin->priv;
if (previous_style && gtk_widget_get_realized (widget)) if (previous_style && gtk_widget_get_realized (widget))
gtk_style_set_background (widget->style, priv->panel, GTK_STATE_NORMAL); gtk_style_set_background (gtk_widget_get_style (widget),
priv->panel, GTK_STATE_NORMAL);
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->style_set (widget, previous_style); GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->style_set (widget, previous_style);
} }
@ -1206,7 +1217,7 @@ gtk_spin_button_button_release (GtkWidget *widget,
if (event->y >= 0 && event->x >= 0 && if (event->y >= 0 && event->x >= 0 &&
event->y <= requisition.height && event->y <= requisition.height &&
event->x <= arrow_size + 2 * widget->style->xthickness) event->x <= arrow_size + 2 * gtk_widget_get_style (widget)->xthickness)
{ {
if (click_child == GTK_ARROW_UP && if (click_child == GTK_ARROW_UP &&
event->y <= requisition.height / 2) event->y <= requisition.height / 2)
@ -1248,8 +1259,8 @@ gtk_spin_button_motion_notify (GtkWidget *widget,
if (event->window == priv->panel) if (event->window == priv->panel)
{ {
gint y = event->y;
GtkRequisition requisition; GtkRequisition requisition;
gint y = event->y;
gdk_event_request_motions (event); gdk_event_request_motions (event);
@ -1494,7 +1505,7 @@ gtk_spin_button_get_text_area_size (GtkEntry *entry,
GTK_ENTRY_CLASS (gtk_spin_button_parent_class)->get_text_area_size (entry, x, y, width, height); GTK_ENTRY_CLASS (gtk_spin_button_parent_class)->get_text_area_size (entry, x, y, width, height);
arrow_size = spin_button_get_arrow_size (GTK_SPIN_BUTTON (entry)); arrow_size = spin_button_get_arrow_size (GTK_SPIN_BUTTON (entry));
panel_width = arrow_size + 2 * GTK_WIDGET (entry)->style->xthickness; panel_width = arrow_size + 2 * gtk_widget_get_style (GTK_WIDGET (entry))->xthickness;
if (width) if (width)
*width -= panel_width; *width -= panel_width;
@ -2240,9 +2251,12 @@ gtk_spin_button_get_wrap (GtkSpinButton *spin_button)
static gint static gint
spin_button_get_arrow_size (GtkSpinButton *spin_button) spin_button_get_arrow_size (GtkSpinButton *spin_button)
{ {
gint size = pango_font_description_get_size (GTK_WIDGET (spin_button)->style->font_desc); GtkStyle *style;
gint size;
gint arrow_size; gint arrow_size;
style = gtk_widget_get_style (GTK_WIDGET (spin_button));
size = pango_font_description_get_size (style->font_desc);
arrow_size = MAX (PANGO_PIXELS (size), MIN_ARROW_WIDTH); arrow_size = MAX (PANGO_PIXELS (size), MIN_ARROW_WIDTH);
return arrow_size - arrow_size % 2; /* force even */ return arrow_size - arrow_size % 2; /* force even */