fixed all the other ports broken by controls labels in wxToolBar patch commit

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

diff --git a/include/wx/os2/dataobj.h b/include/wx/os2/dataobj.h
index 2f6ed49da540b96219ff5a26af984f839f092014..5e4eeb50793b1903c223fa12b08b910f6bb38a9b 100644 (file)
--- a/include/wx/os2/dataobj.h
+++ b/include/wx/os2/dataobj.h
@@ -1,32 +1,39 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        os2/dataobj.h
+// Name:        wx/os2/dataobj.h
 // Purpose:     declaration of the wxDataObject
-// Author:      David Webster (adapted from Robert Roebling's gtk port)
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_GTK_DATAOBJ_H_
-#define _WX_GTK_DATAOBJ_H_
-
-#ifdef __GNUG__
-    #pragma interface "dataobj.h"
-#endif
+#ifndef _WX_OS2_DATAOBJ_H_
+#define _WX_OS2_DATAOBJ_H_
 
 // ----------------------------------------------------------------------------
 // wxDataObject is the same as wxDataObjectBase under wxGTK
 // ----------------------------------------------------------------------------
 
-class wxDataObject : public wxDataObjectBase
+class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
 {
 public:
     wxDataObject();
+    virtual ~wxDataObject();
 
-    virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
-};
+    virtual bool IsSupportedFormat( const wxDataFormat& eFormat
+                                   ,Direction           eDir = Get
+                                  ) const
+    {
+        return(IsSupported( eFormat
+                           ,eDir
+                          ));
+    }
 
-#endif // _WX_GTK_DATAOBJ_H_
+    PDRAGITEM GetInterface(void) const {return m_pDataObject;}
+private:
+    PDRAGITEM                       m_pDataObject;
+};
 
+#endif // _WX_OS2_DATAOBJ_H_