Commit f37d395c authored by Lars Hamann's avatar Lars Hamann Committed by Lars Hamann

removed extra gtk_spin_button_update calls again. unblock dnd signal

Sat Jan 23 01:44:43 1999  Lars Hamann  <lars@gtk.org>

	* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
	(gtk_spin_button_get_value_as_float): removed extra
 	gtk_spin_button_update calls again.
	* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
	neccessary
	* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
	switch_page
	(gtk_notebook_set_shape): don't use cur_page if it's NULL.
parent ad987142
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
(gtk_spin_button_get_value_as_float): removed extra
gtk_spin_button_update calls again.
* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
neccessary
* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
switch_page
(gtk_notebook_set_shape): don't use cur_page if it's NULL.
Fri Jan 22 12:20:54 1999 Jeff Garzik <jgarzik@pobox.com>
* gtk/gtktooltips.c:
......@@ -164,7 +175,7 @@ Tue Jan 19 22:15:10 1999 Lars Hamann <lars@gtk.org>
(gtk_list_signal_focus_lost): removed.
(gtk_list_focus) (gtk_list_set_focus_child): set last_focus_child.
(gtk_list_remove_items_internal) (gtk_list_clear_items): unset
undo_focus_child if necessary. In case of SELECTION_BROWSE/EXTENDED
undo_focus_child if neccessary. In case of SELECTION_BROWSE/EXTENDED
select a new item if selection is empty.
Tue Jan 19 00:21:15 1999 Tim Janik <timj@gtk.org>
......
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
(gtk_spin_button_get_value_as_float): removed extra
gtk_spin_button_update calls again.
* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
neccessary
* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
switch_page
(gtk_notebook_set_shape): don't use cur_page if it's NULL.
Fri Jan 22 12:20:54 1999 Jeff Garzik <jgarzik@pobox.com>
* gtk/gtktooltips.c:
......@@ -164,7 +175,7 @@ Tue Jan 19 22:15:10 1999 Lars Hamann <lars@gtk.org>
(gtk_list_signal_focus_lost): removed.
(gtk_list_focus) (gtk_list_set_focus_child): set last_focus_child.
(gtk_list_remove_items_internal) (gtk_list_clear_items): unset
undo_focus_child if necessary. In case of SELECTION_BROWSE/EXTENDED
undo_focus_child if neccessary. In case of SELECTION_BROWSE/EXTENDED
select a new item if selection is empty.
Tue Jan 19 00:21:15 1999 Tim Janik <timj@gtk.org>
......
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
(gtk_spin_button_get_value_as_float): removed extra
gtk_spin_button_update calls again.
* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
neccessary
* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
switch_page
(gtk_notebook_set_shape): don't use cur_page if it's NULL.
Fri Jan 22 12:20:54 1999 Jeff Garzik <jgarzik@pobox.com>
* gtk/gtktooltips.c:
......@@ -164,7 +175,7 @@ Tue Jan 19 22:15:10 1999 Lars Hamann <lars@gtk.org>
(gtk_list_signal_focus_lost): removed.
(gtk_list_focus) (gtk_list_set_focus_child): set last_focus_child.
(gtk_list_remove_items_internal) (gtk_list_clear_items): unset
undo_focus_child if necessary. In case of SELECTION_BROWSE/EXTENDED
undo_focus_child if neccessary. In case of SELECTION_BROWSE/EXTENDED
select a new item if selection is empty.
Tue Jan 19 00:21:15 1999 Tim Janik <timj@gtk.org>
......
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
(gtk_spin_button_get_value_as_float): removed extra
gtk_spin_button_update calls again.
* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
neccessary
* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
switch_page
(gtk_notebook_set_shape): don't use cur_page if it's NULL.
Fri Jan 22 12:20:54 1999 Jeff Garzik <jgarzik@pobox.com>
* gtk/gtktooltips.c:
......@@ -164,7 +175,7 @@ Tue Jan 19 22:15:10 1999 Lars Hamann <lars@gtk.org>
(gtk_list_signal_focus_lost): removed.
(gtk_list_focus) (gtk_list_set_focus_child): set last_focus_child.
(gtk_list_remove_items_internal) (gtk_list_clear_items): unset
undo_focus_child if necessary. In case of SELECTION_BROWSE/EXTENDED
undo_focus_child if neccessary. In case of SELECTION_BROWSE/EXTENDED
select a new item if selection is empty.
Tue Jan 19 00:21:15 1999 Tim Janik <timj@gtk.org>
......
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
(gtk_spin_button_get_value_as_float): removed extra
gtk_spin_button_update calls again.
* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
neccessary
* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
switch_page
(gtk_notebook_set_shape): don't use cur_page if it's NULL.
Fri Jan 22 12:20:54 1999 Jeff Garzik <jgarzik@pobox.com>
* gtk/gtktooltips.c:
......@@ -164,7 +175,7 @@ Tue Jan 19 22:15:10 1999 Lars Hamann <lars@gtk.org>
(gtk_list_signal_focus_lost): removed.
(gtk_list_focus) (gtk_list_set_focus_child): set last_focus_child.
(gtk_list_remove_items_internal) (gtk_list_clear_items): unset
undo_focus_child if necessary. In case of SELECTION_BROWSE/EXTENDED
undo_focus_child if neccessary. In case of SELECTION_BROWSE/EXTENDED
select a new item if selection is empty.
Tue Jan 19 00:21:15 1999 Tim Janik <timj@gtk.org>
......
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
(gtk_spin_button_get_value_as_float): removed extra
gtk_spin_button_update calls again.
* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
neccessary
* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
switch_page
(gtk_notebook_set_shape): don't use cur_page if it's NULL.
Fri Jan 22 12:20:54 1999 Jeff Garzik <jgarzik@pobox.com>
* gtk/gtktooltips.c:
......@@ -164,7 +175,7 @@ Tue Jan 19 22:15:10 1999 Lars Hamann <lars@gtk.org>
(gtk_list_signal_focus_lost): removed.
(gtk_list_focus) (gtk_list_set_focus_child): set last_focus_child.
(gtk_list_remove_items_internal) (gtk_list_clear_items): unset
undo_focus_child if necessary. In case of SELECTION_BROWSE/EXTENDED
undo_focus_child if neccessary. In case of SELECTION_BROWSE/EXTENDED
select a new item if selection is empty.
Tue Jan 19 00:21:15 1999 Tim Janik <timj@gtk.org>
......
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int)
(gtk_spin_button_get_value_as_float): removed extra
gtk_spin_button_update calls again.
* gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if
neccessary
* gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before
switch_page
(gtk_notebook_set_shape): don't use cur_page if it's NULL.
Fri Jan 22 12:20:54 1999 Jeff Garzik <jgarzik@pobox.com>
* gtk/gtktooltips.c:
......@@ -164,7 +175,7 @@ Tue Jan 19 22:15:10 1999 Lars Hamann <lars@gtk.org>
(gtk_list_signal_focus_lost): removed.
(gtk_list_focus) (gtk_list_set_focus_child): set last_focus_child.
(gtk_list_remove_items_internal) (gtk_list_clear_items): unset
undo_focus_child if necessary. In case of SELECTION_BROWSE/EXTENDED
undo_focus_child if neccessary. In case of SELECTION_BROWSE/EXTENDED
select a new item if selection is empty.
Tue Jan 19 00:21:15 1999 Tim Janik <timj@gtk.org>
......
......@@ -4658,7 +4658,18 @@ gtk_clist_unmap (GtkWidget *widget)
clist->click_cell.row = -1;
clist->click_cell.column = -1;
clist->drag_button = 0;
GTK_CLIST_UNSET_FLAG (clist, CLIST_IN_DRAG);
if (GTK_CLIST_IN_DRAG(clist))
{
gpointer drag_data;
GTK_CLIST_UNSET_FLAG (clist, CLIST_IN_DRAG);
drag_data = gtk_object_get_data (GTK_OBJECT (clist),
"gtk-site-data");
if (drag_data)
gtk_signal_handler_unblock_by_data (GTK_OBJECT (clist),
drag_data);
}
}
for (i = 0; i < clist->columns; i++)
......
......@@ -1071,8 +1071,8 @@ gtk_notebook_button_press (GtkWidget *widget,
else
{
gtk_notebook_switch_focus_tab (notebook, children);
gtk_notebook_switch_page (notebook, page, num);
gtk_widget_grab_focus (widget);
gtk_notebook_switch_page (notebook, page, num);
}
break;
}
......@@ -2477,7 +2477,11 @@ gtk_notebook_set_shape (GtkNotebook *notebook)
}
else
{
page = notebook->cur_page;
if (notebook->cur_page)
page = notebook->cur_page;
else
page = notebook->children->data;
if (!GTK_WIDGET_MAPPED (page->tab_label))
{
if (notebook->tab_pos == GTK_POS_LEFT)
......
......@@ -1402,9 +1402,6 @@ gtk_spin_button_get_value_as_float (GtkSpinButton *spin_button)
g_return_val_if_fail (spin_button != NULL, 0.0);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0.0);
if (GTK_EDITABLE (spin_button)->editable)
gtk_spin_button_update (spin_button);
return spin_button->adjustment->value;
}
......@@ -1416,9 +1413,6 @@ gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button)
g_return_val_if_fail (spin_button != NULL, 0);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spin_button), 0);
if (GTK_EDITABLE (spin_button)->editable)
gtk_spin_button_update (spin_button);
val = spin_button->adjustment->value;
if (val - floor (val) < ceil (val) - val)
return floor (val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment