Ticket #1899: sugar-1899.patch

gtk/engine/sugar-info.c

@@ -71 +71 @@
     gdouble line_width = info->rc_style->line_width;
 
     if (info->widget) {
-        range_info->focused = GTK_WIDGET_HAS_FOCUS (info->widget);
+        range_info->focused = gtk_widget_has_focus (info->widget);
     } else {
         /* Fall back to unfocused and orientation from the width/height. */
         range_info->focused = FALSE;

gtk/engine/sugar-style.c

@@ -415 +415 @@
         sugar_draw_button (cr, &info);
 
         /* Spinbutton focus hack. */
-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
+        if (widget && gtk_widget_has_focus (widget)) {
             /* Draw a focus for the spinbutton */
             sugar_style_draw_focus (style, window, GTK_STATE_NORMAL, area, widget, detail, x, y, width, height);
         }
@@ -444 +444 @@
 
             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
             
-            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
+            if (widget && !gtk_widget_is_sensitive (widget))
                 info.state = GTK_STATE_INSENSITIVE;
 
             /* Needed because the trough and bar are cached in a buffer inside GtkProgress. */
@@ -458 +458 @@
 
             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
             
-            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
+            if (widget && !gtk_widget_is_sensitive (widget))
                 info.state = GTK_STATE_INSENSITIVE;
             
             if (widget && GTK_IS_PROGRESS_BAR (widget)) {
@@ -585 +585 @@
 {
     /* Hack to change the entries background when it has the focus. */
     if (DETAIL ("entry_bg")) {
-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
+        if (widget && gtk_widget_has_focus (widget)) {
             state_type = GTK_STATE_ACTIVE;
         }
     } else if (DETAIL ("radiobutton") || DETAIL ("checkbutton")) {
@@ -638 +638 @@
         /* XXX: This fakes an ACTIVE state for the focused entry.
          *      Getting this changed in GTK+ with a style property would be cleaner
          *      as that also works for the font colors. (see also draw_flat_box) */
-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
+        if (widget && gtk_widget_has_focus (widget)) {
             info.state = GTK_STATE_ACTIVE;
         }
-        if (widget && !GTK_WIDGET_IS_SENSITIVE (widget)) {
+        if (widget && !gtk_widget_is_sensitive (widget)) {
             info.state = GTK_STATE_INSENSITIVE;
         }