Numerous changes to comply with use of wxCoord.

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index b109dc64fe7b0dbc7145bfbc9152193abaedc8b5..c17f2f83412da42f3316276fa56160b5b8721664 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"
+#elif defined(__WXPM__)
+    #include "wx/os2/dnd.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/dnd.h"
 #endif
@@ -35,7 +37,7 @@
 class WXDLLEXPORT wxPrivateDataObject : public wxDataObject
 {
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
-    DECLARE_DYNAMIC_CLASS( wxPrivateDataObject )
+    DECLARE_CLASS( wxPrivateDataObject )
 #endif
 
 public:
@@ -85,8 +87,10 @@ private:
     size_t     m_size;
     void      *m_data;
 
+#if !defined(__WXMOTIF__)
     // the data format
     wxDataFormat m_format;
+#endif
 };