diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index cb7a12beba..ce742d343b 100644
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -16,7 +16,14 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+// Unfortunately the new way of implementing the region iterator
+// doesn't work with GTK+ 2.0 or above (can't access a Region in
+// GdkPrivateRegion)
+#ifdef __WXGTK20__
+#define OLDCODE 1
+#else
 #define OLDCODE 0
+#endif
 
 //-----------------------------------------------------------------------------
 // wxRegion
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index af70202eaa..02d5fb9d35 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -219,7 +219,9 @@ extern bool g_mainThreadLocked;
 // debug
 //-----------------------------------------------------------------------------
 
+#ifndef __WXGTK20__
 #define DISABLE_STYLE_IF_BROKEN_THEME 1
+#endif
 
 #ifdef __WXDEBUG__
 
diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index cb7a12beba..ce742d343b 100644
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -16,7 +16,14 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+// Unfortunately the new way of implementing the region iterator
+// doesn't work with GTK+ 2.0 or above (can't access a Region in
+// GdkPrivateRegion)
+#ifdef __WXGTK20__
+#define OLDCODE 1
+#else
 #define OLDCODE 0
+#endif
 
 //-----------------------------------------------------------------------------
 // wxRegion
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index af70202eaa..02d5fb9d35 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -219,7 +219,9 @@ extern bool g_mainThreadLocked;
 // debug
 //-----------------------------------------------------------------------------
 
+#ifndef __WXGTK20__
 #define DISABLE_STYLE_IF_BROKEN_THEME 1
+#endif
 
 #ifdef __WXDEBUG__