]> Pileus Git - ~andy/gtk/commitdiff
gtk: no need to add GTK_STYLE_FLAG_FOCUSED to the widget's state flags
authorMichael Natterer <mitch@gimp.org>
Fri, 21 Jan 2011 14:38:52 +0000 (15:38 +0100)
committerMichael Natterer <mitch@gimp.org>
Fri, 21 Jan 2011 14:38:52 +0000 (15:38 +0100)
because they correctly contain that flag now if the widget has focus.

gtk/gtkentry.c
gtk/gtkspinbutton.c
gtk/gtktextdisplay.c

index f05cc2c6fce1146670a29db54deebe1a9878bd65..b21146c7235ad5e81fe48f719cc7761deedd16c9 100644 (file)
@@ -3500,9 +3500,6 @@ gtk_entry_draw (GtkWidget *widget,
   context = gtk_widget_get_style_context (widget);
   state = gtk_widget_get_state_flags (widget);
 
-  if (gtk_widget_has_focus (widget))
-    state |= GTK_STATE_FLAG_FOCUSED;
-
   gtk_style_context_save (context);
   gtk_style_context_set_state (context, state);
 
index 1d357e38ae9664f0e733d78bbaf948d9b8acfa22..729cc8933ec994d144084879c68140eae654d812 100644 (file)
@@ -928,9 +928,6 @@ gtk_spin_button_draw (GtkWidget      *widget,
 
   state = gtk_widget_get_state_flags (widget);
 
-  if (gtk_widget_has_focus (widget))
-    state |= GTK_STATE_FLAG_FOCUSED;
-
   gtk_style_context_save (context);
   gtk_style_context_set_state (context, state);
   gtk_style_context_remove_class (context, GTK_STYLE_CLASS_ENTRY);
index a145c0346aa125abe76a2eab0e16a1d2d0ec28d8..7ea85f7d72d8407a8f71971836b2651f2b1fd643 100644 (file)
@@ -210,9 +210,6 @@ gtk_text_renderer_prepare_run (PangoRenderer  *renderer,
     {
       state |= GTK_STATE_FLAG_SELECTED;
 
-      if (gtk_widget_has_focus (text_renderer->widget))
-        state |= GTK_STATE_FLAG_FOCUSED;
-
       gtk_style_context_get (context, state,
                              "color", &fg_rgba,
                               NULL);