ensure that dialog gripper is always positioned below the other children, even if...

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

diff --git a/include/wx/gtk1/dataobj2.h b/include/wx/gtk1/dataobj2.h
index 153503039693272a90fcf45b34a13d243a783202..8f0e07fe7c47821e91a2463d1a8c2edce4f787df 100644 (file)
--- a/include/wx/gtk1/dataobj2.h
+++ b/include/wx/gtk1/dataobj2.h
@@ -1,25 +1,21 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/dataobj2.h
+// Name:        wx/gtk1/dataobj2.h

 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Robert Roebling
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Robert Roebling
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ2_H_
 #define _WX_GTK_DATAOBJ2_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ2_H_
 #define _WX_GTK_DATAOBJ2_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #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


@@ -27,7 +23,7 @@ public:
     wxBitmapDataObject(const wxBitmap& bitmap);
 
     // destr
     wxBitmapDataObject(const wxBitmap& bitmap);
 
     // destr

-    ~wxBitmapDataObject();
+    virtual ~wxBitmapDataObject();

 
     // override base class virtual to update PNG data too
     virtual void SetBitmap(const wxBitmap& bitmap);
 
     // override base class virtual to update PNG data too
     virtual void SetBitmap(const wxBitmap& bitmap);


@@ -63,7 +59,7 @@ private:
 // wxFileDataObject is a specialization of wxDataObject for file names
 // ----------------------------------------------------------------------------
 
 // wxFileDataObject is a specialization of wxDataObject for file names
 // ----------------------------------------------------------------------------
 

-class wxFileDataObject : public wxFileDataObjectBase
+class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase

 {
 public:
     // implement base class pure virtuals
 {
 public:
     // implement base class pure virtuals