From ac029997d30ed0e76b319d0ccadb058e21f4d054 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <benjamin@sipsolutions.net>
Date: Thu, 06 May 2010 17:13:51 +0000
Subject: Revert 5d88c89 and instead disable the just remove time flags. #1899

---
diff --git a/gtk/engine/Makefile.am b/gtk/engine/Makefile.am
index eb720ff..d23508a 100644
--- a/gtk/engine/Makefile.am
+++ b/gtk/engine/Makefile.am
@@ -1,7 +1,4 @@
 INCLUDES = \
-	-DGTK_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED \
-	-DG_DISABLE_DEPRECATED \
 	$(ENGINE_CFLAGS) $(WARN_CFLAGS)
 
 enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
diff --git a/gtk/engine/sugar-info.c b/gtk/engine/sugar-info.c
index 8d7832f..b4bf9c5 100644
--- a/gtk/engine/sugar-info.c
+++ b/gtk/engine/sugar-info.c
@@ -71,7 +71,7 @@ sugar_fill_range_info (SugarRangeInfo *range_info, gboolean trough)
     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;
diff --git a/gtk/engine/sugar-style.c b/gtk/engine/sugar-style.c
index 88a80a4..5e5dbfc 100644
--- a/gtk/engine/sugar-style.c
+++ b/gtk/engine/sugar-style.c
@@ -415,7 +415,7 @@ sugar_style_draw_box (GtkStyle       *style,
         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);
         }
@@ -585,7 +585,7 @@ sugar_style_draw_flat_box (GtkStyle       *style,
 {
     /* 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,7 +638,7 @@ sugar_style_draw_shadow (GtkStyle       *style,
         /* 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)) {
--
cgit v0.9.1