From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Mon, 23 Jan 2006 19:52:12 +0000 (+0000)
Subject: Fix for gtk1 separation
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d74c6a9599300a01b50f0b3d506eb006be569c02?ds=sidebyside

Fix for gtk1 separation


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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index f3759b7cbd..6f2b75456d 100644
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -166,8 +166,10 @@ public:
     #include "wx/motif/dataobj.h"
 #elif defined(__WXX11__)
     #include "wx/x11/dataobj.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/dataobj.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/dataobj.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dataobj.h"
 #elif defined(__WXCOCOA__)
@@ -495,8 +497,10 @@ private:
 
     // wxURLDataObject defined in msw/ole/dataobj2.h
 #else // !__WXMSW__
-    #if defined(__WXGTK__)
+    #if defined(__WXGTK20__)
         #include "wx/gtk/dataobj2.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/dataobj2.h"
     #elif defined(__WXX11__)
         #include "wx/x11/dataobj2.h"
     #elif defined(__WXMOTIF__)