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

Remove check for previous state being ACTIVE. Bug 153876.

Browse Source 
Sat Oct 23 15:17:55 2004  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
	for previous state being ACTIVE. Bug 153876.
This commit is contained in:
Søren Sandmann 2004-10-23 19:18:51 +00:00 committed by Søren Sandmann Pedersen
parent a04c0a35d9
commit 8ebef872f3
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Oct 23 15:17:55 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
for previous state being ACTIVE. Bug 153876.
2004-10-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received)

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Sat Oct 23 15:17:55 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
for previous state being ACTIVE. Bug 153876.
2004-10-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received)

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Sat Oct 23 15:17:55 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
for previous state being ACTIVE. Bug 153876.
2004-10-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received)

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Sat Oct 23 15:17:55 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
for previous state being ACTIVE. Bug 153876.
2004-10-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received)

17
gtk/gtkmenutoolbutton.c
View File

@ -258,32 +258,31 @@ button_state_changed_cb (GtkWidget *widget,
GtkMenuToolButton *button)
{
GtkMenuToolButtonPrivate *priv;
GtkWidget *b;
GtkWidget *other;
GtkStateType state = GTK_WIDGET_STATE (widget);
priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
b = (widget == priv->arrow_button) ? priv->button : priv->arrow_button;
other = (widget == priv->arrow_button) ? priv->button : priv->arrow_button;
g_signal_handlers_block_by_func (G_OBJECT (b),
g_signal_handlers_block_by_func (G_OBJECT (other),
G_CALLBACK (button_state_changed_cb),
button);
if (state == GTK_STATE_PRELIGHT &&
previous_state != GTK_STATE_ACTIVE)
if (state == GTK_STATE_PRELIGHT)
{
gtk_widget_set_state (b, state);
gtk_widget_set_state (other, state);
}
else if (state == GTK_STATE_NORMAL)
{
gtk_widget_set_state (b, state);
gtk_widget_set_state (other, state);
}
else if (state == GTK_STATE_ACTIVE)
{
gtk_widget_set_state (b, GTK_STATE_NORMAL);
gtk_widget_set_state (other, GTK_STATE_NORMAL);
}
g_signal_handlers_unblock_by_func (G_OBJECT (b),
g_signal_handlers_unblock_by_func (G_OBJECT (other),
G_CALLBACK (button_state_changed_cb),
button);
}