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

realization fixes by lars.

Browse Source 
-timj
This commit is contained in:
Tim Janik
1998-03-03 00:20:49 +00:00
parent 3cbeacaf58
commit 3eac46a981
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkspinbutton.c
View File

@ -203,7 +203,7 @@ gtk_spin_button_map (GtkWidget *widget)
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget)); g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
if (!GTK_WIDGET_MAPPED (widget)) if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
{ {
gdk_window_show (GTK_SPIN_BUTTON (widget)->panel); gdk_window_show (GTK_SPIN_BUTTON (widget)->panel);
GTK_WIDGET_CLASS (parent_class)->map (widget); GTK_WIDGET_CLASS (parent_class)->map (widget);
@ -277,6 +277,7 @@ gtk_spin_button_unrealize (GtkWidget *widget)
if (spin->panel) if (spin->panel)
{ {
gdk_window_set_user_data (spin->panel, NULL);
gdk_window_destroy (spin->panel); gdk_window_destroy (spin->panel);
spin->panel = NULL; spin->panel = NULL;
} }
@ -314,19 +315,22 @@ gtk_spin_button_size_allocate (GtkWidget *widget,
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, &child_allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, &child_allocation);
widget->allocation = *allocation; widget->allocation = *allocation;
child_allocation.width = ARROW_SIZE + 2 * widget->style->klass->xthickness;
child_allocation.height = widget->requisition.height;
child_allocation.x = allocation->x + allocation->width - ARROW_SIZE
- 2 * widget->style->klass->xthickness;
child_allocation.y = allocation->y +
(allocation->height - widget->requisition.height) / 2;
gdk_window_move_resize (GTK_SPIN_BUTTON (widget)->panel, if (GTK_WIDGET_REALIZED (widget))
child_allocation.x, {
child_allocation.y, child_allocation.width = ARROW_SIZE + 2 * widget->style->klass->xthickness;
child_allocation.width, child_allocation.height = widget->requisition.height;
child_allocation.height); child_allocation.x = (allocation->x + allocation->width - ARROW_SIZE -
2 * widget->style->klass->xthickness);
child_allocation.y = allocation->y + (allocation->height -
widget->requisition.height) / 2;
gdk_window_move_resize (GTK_SPIN_BUTTON (widget)->panel,
child_allocation.x,
child_allocation.y,
child_allocation.width,
child_allocation.height);
}
} }
static void static void