typedef unsigned int bool (instead of int) for consistency with defs.h

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index b109dc64fe7b0dbc7145bfbc9152193abaedc8b5..0e9659bfc55a7763d0d058bee0caf80c0874fdaf 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -22,6 +22,8 @@
     #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"
     #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"

+#elif defined(__WXPM__)
+    #include "wx/os2/dataobj.h"

 #elif defined(__WXSTUBS__)
     #include "wx/stubs/dnd.h"
 #endif
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/dnd.h"
 #endif


@@ -85,8 +87,10 @@ private:
     size_t     m_size;
     void      *m_data;
 
     size_t     m_size;
     void      *m_data;
 

+#if !defined(__WXGTK__) && !defined(__WXMOTIF__)

     // the data format
     wxDataFormat m_format;
     // the data format
     wxDataFormat m_format;

+#endif

 };
 
 
 };