no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / motif / dataobj2.h

diff --git a/include/wx/motif/dataobj2.h b/include/wx/motif/dataobj2.h
index 75ddcbd96175a16b550eeec6697c6bd212a37bcd..c80d8c6b65ca047c4b4caa7b677356d8ade0f2d4 100644 (file)
--- a/include/wx/motif/dataobj2.h
+++ b/include/wx/motif/dataobj2.h
@@ -1,25 +1,21 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/motif/dataobj2.h
+// Name:        wx/motif/dataobj2.h

 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Mattia Barbon
 // Created:     27.04.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Mattia Barbon
 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Mattia Barbon
 // Created:     27.04.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Mattia Barbon

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_DATAOBJ2_H_
 #define _WX_MOTIF_DATAOBJ2_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_DATAOBJ2_H_
 #define _WX_MOTIF_DATAOBJ2_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dataobj.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 // ----------------------------------------------------------------------------
 

-class wxBitmapDataObject : public wxBitmapDataObjectBase
+class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -33,7 +29,16 @@ public:
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);

+
+    // unhide base class virtual functions
+    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
+        { return GetDataSize(); }
+    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
+                             void *buf) const
+        { return GetDataHere(buf); }
+    virtual bool SetData(const wxDataFormat& WXUNUSED(format),
+                         size_t len, const void *buf)
+        { return SetData(len, buf); }

 };
 
 #endif // _WX_MOTIF_DATAOBJ2_H_
 };
 
 #endif // _WX_MOTIF_DATAOBJ2_H_

-