2 step creation for wxDocMDIChildFrame (patch 661657)

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 1cdd0dfe6c2b39fb982d8df05b84b62622a4592a..4aa203de8269d5e63bad83b87ea65b9f2bd7aea2 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -19,11 +19,14 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-

 #include "wx/defs.h"
 #include "wx/defs.h"

+
+#if wxUSE_DATAOBJ
+

 #include "wx/string.h"
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/string.h"
 #include "wx/bitmap.h"
 #include "wx/list.h"

+#include "wx/arrstr.h"

 
 // ============================================================================
 /*
 
 // ============================================================================
 /*


@@ -462,6 +465,8 @@ private:
         #include "wx/gtk/dataobj2.h"
     #elif defined(__WXX11__)
         #include "wx/x11/dataobj2.h"
         #include "wx/gtk/dataobj2.h"
     #elif defined(__WXX11__)
         #include "wx/x11/dataobj2.h"

+    #elif defined(__WXMOTIF__)
+        #include "wx/motif/dataobj2.h"

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


@@ -477,4 +482,6 @@ private:
     };
 #endif // __WXMSW__/!__WXMSW__
 
     };
 #endif // __WXMSW__/!__WXMSW__
 

+#endif // wxUSE_DATAOBJ
+

 #endif // _WX_DATAOBJ_H_BASE_
 #endif // _WX_DATAOBJ_H_BASE_