More GTK+ 1.3.1 fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index cb7a12bebac9c598cc304476c77fab96c12ea983..ce742d343be2d29de26daceb351064f119397b0f 100644 (file)
--- 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 af70202eaaa82dc1298283bad8f019c190a07a9e..02d5fb9d3563d5e6583c63beb147f27dcd65ab54 100644 (file)
--- 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 cb7a12bebac9c598cc304476c77fab96c12ea983..ce742d343be2d29de26daceb351064f119397b0f 100644 (file)
--- 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 af70202eaaa82dc1298283bad8f019c190a07a9e..02d5fb9d3563d5e6583c63beb147f27dcd65ab54 100644 (file)
--- 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__