Bitmap button updates

[wxWidgets.git] / include / wx / dataobj.h

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 1e6ecad47068effc5ff4803f1f3e22223b5f2278..d87edeaff7d17f25b11cb98bd18c80ee065fb50e 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DATAOBJ_H_BASE_
 #define _WX_DATAOBJ_H_BASE_
 
 #ifndef _WX_DATAOBJ_H_BASE_
 #define _WX_DATAOBJ_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "dataobjbase.h"
 #endif
 
     #pragma interface "dataobjbase.h"
 #endif
 


@@ -161,6 +161,8 @@ public:
     #include "wx/msw/ole/dataobj.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/dataobj.h"
     #include "wx/msw/ole/dataobj.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/dataobj.h"

+#elif defined(__WXX11__)
+    #include "wx/x11/dataobj.h"

 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj.h"
 #elif defined(__WXMAC__)


@@ -458,6 +460,8 @@ private:
 #else // !__WXMSW__
     #if defined(__WXGTK__)
         #include "wx/gtk/dataobj2.h"
 #else // !__WXMSW__
     #if defined(__WXGTK__)
         #include "wx/gtk/dataobj2.h"

+    #elif defined(__WXX11__)
+        #include "wx/x11/dataobj2.h"

     #elif defined(__WXMAC__)
         #include "wx/mac/dataobj2.h"
     #elif defined(__WXPM__)
     #elif defined(__WXMAC__)
         #include "wx/mac/dataobj2.h"
     #elif defined(__WXPM__)