[PATCH 2/2] Correct the constant used with gtk_widget_set_state_flags

David Shea dshea at redhat.com
Wed Jul 9 18:10:30 UTC 2014


GtkStateType and GtkStateFlags are different enumerations even though
they contain basically the same members. Furthermore, setting the
focused flag doesn't seem to really do anything, but our code worked by
accident because it was setting the value for GTK_STATE_FLAG_PRELIGHT |
GTK_STATE_FLAG_SELECTED. Just set GTK_STATE_FLAG_SELECTED instead.
---
 widgets/src/DiskOverview.c  | 4 ++--
 widgets/src/SpokeSelector.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/widgets/src/DiskOverview.c b/widgets/src/DiskOverview.c
index 8569ec2..f558e7f 100644
--- a/widgets/src/DiskOverview.c
+++ b/widgets/src/DiskOverview.c
@@ -491,9 +491,9 @@ void anaconda_disk_overview_set_chosen(AnacondaDiskOverview *widget, gboolean is
 static gboolean anaconda_disk_overview_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data) {
     GtkStateFlags new_state;
 
-    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FOCUSED;
+    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FLAG_SELECTED;
     if (event->in)
-        new_state |= GTK_STATE_FOCUSED;
+        new_state |= GTK_STATE_FLAG_SELECTED;
     gtk_widget_set_state_flags(widget, new_state, TRUE);
 
     return FALSE;
diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c
index 03ae610..492a6e2 100644
--- a/widgets/src/SpokeSelector.c
+++ b/widgets/src/SpokeSelector.c
@@ -438,9 +438,9 @@ void anaconda_spoke_selector_set_incomplete(AnacondaSpokeSelector *spoke, gboole
 static gboolean anaconda_spoke_selector_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data) {
     GtkStateFlags new_state;
 
-    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FOCUSED;
+    new_state = gtk_widget_get_state_flags(widget) & ~GTK_STATE_FLAG_SELECTED;
     if (event->in)
-        new_state |= GTK_STATE_FOCUSED;
+        new_state |= GTK_STATE_FLAG_SELECTED;
     gtk_widget_set_state_flags(widget, new_state, TRUE);
     return FALSE;
 }
-- 
2.0.0



More information about the anaconda-patches mailing list