Bump ifdefs to 3.8 (now ifdefs say 3.0 instead of 3.2 or 3.8)

(bzr r14788)

6 files changed, 10 insertions, 16 deletions

diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp
index c568d3ca7..58e2b9dc9 100644
--- a/src/svg-view-widget.cpp
+++ b/src/svg-view-widget.cpp
@@ -100,7 +100,7 @@ static void sp_svg_view_widget_init(SPSVGSPViewWidget *vw)
 	gtk_widget_set_style (vw->canvas, style);
 #endif
 
-#if GTK_CHECK_VERSION(3,8,0)
+#if GTK_CHECK_VERSION(3,0,0)
 	gtk_container_add (GTK_CONTAINER (vw->sw), vw->canvas);
 #else
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (vw->sw), vw->canvas);
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index a1c7d41bd..f2ee79d06 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -573,7 +573,7 @@ void StatusWidget::end_process()
     clear();
 }
 
-#if !GTK_CHECK_VERSION(3,6,0)
+#if !GTK_CHECK_VERSION(3,0,0)
 SearchEntry::SearchEntry() : Gtk::Entry()
 {
     signal_changed().connect(sigc::mem_fun(*this, &SearchEntry::_on_changed));
@@ -1222,7 +1222,7 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types
     label_not_found = new Gtk::Label();
     label_description = new Gtk::Label();
 
-#if GTK_CHECK_VERSION(3,6,0)
+#if GTK_CHECK_VERSION(3,0,0)
     entry_search = new Gtk::SearchEntry();
 #else
     entry_search = new SearchEntry();
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 6ceceb9ef..9de24d821 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -26,7 +26,7 @@
 
 #include <cairomm/refptr.h>
 
-#if GTK_CHECK_VERSION(3,6,0)
+#if GTK_CHECK_VERSION(3,0,0)
 # include <gtkmm/searchentry.h>
 #endif
 
@@ -336,7 +336,7 @@ public:
     Gtk::Label* label;
 };
 
-#if !GTK_CHECK_VERSION(3,6,0)
+#if !GTK_CHECK_VERSION(3,0,0)
 /**
  * A Gtk::Entry with search & clear icons
  */
@@ -460,7 +460,7 @@ private:
     Glib::ustring filename_image;
     Glib::ustring filename_thumbnail;
 
-#if GTK_CHECK_VERSION(3,6,0)
+#if GTK_CHECK_VERSION(3,0,0)
     Gtk::SearchEntry *entry_search;
 #else
     SearchEntry *entry_search;
diff --git a/src/ui/widget/gimpcolorwheel.c b/src/ui/widget/gimpcolorwheel.c
index c857cfa8a..3642848df 100644
--- a/src/ui/widget/gimpcolorwheel.c
+++ b/src/ui/widget/gimpcolorwheel.c
@@ -1246,7 +1246,7 @@ paint_triangle (GimpColorWheel *wheel,
 #endif
 }
 
-#if GTK_CHECK_VERSION(3,2,0)
+#if GTK_CHECK_VERSION(3,0,0)
 static gboolean
 gimp_color_wheel_draw (GtkWidget *widget,
                        cairo_t   *cr)
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 19dbb04ab..de14caa12 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -239,7 +239,7 @@ static
 gboolean eek_preview_draw(GtkWidget *widget,
                           cairo_t   *cr)
 {
-    GtkStyle          *style   = gtk_widget_get_style(widget);
+
     EekPreview        *preview = EEK_PREVIEW(widget);
     EekPreviewPrivate *priv    = EEK_PREVIEW_GET_PRIVATE(preview);
 
@@ -284,7 +284,8 @@ gboolean eek_preview_draw(GtkWidget *widget,
                           0, 0,
                           allocation.width, allocation.height);
 #else
-    GdkWindow* window = gtk_widget_get_window(widget);
+    GtkStyle *style = gtk_widget_get_style(widget);
+    GdkWindow *window = gtk_widget_get_window(widget);
         
     gtk_paint_flat_box( style,
                         window,
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index 3a5e76277..0b473f173 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -284,17 +284,10 @@ sp_ruler_init (SPRuler *ruler)
   priv->font_scale           = DEFAULT_RULER_FONT_SCALE;
 
 #if GTK_CHECK_VERSION(3,0,0)
-  #if GTK_CHECK_VERSION(3,8,0)
   const gchar *str = 
     "SPRuler {\n"
     "  background-color: @theme_bg_color;\n"
     "}\n";
-  #else
-  const gchar *str = 
-    "SPRuler {\n"
-    "  background-color: @bg_color;\n"
-    "}\n";
-  #endif
   GtkCssProvider *css = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (css, str, -1, NULL);
   gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (ruler)),