use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/cocoa/dataobj2.h b/include/wx/cocoa/dataobj2.h
index a447bb72e12ad8fe8ed9e1f47916455efc2ce931..1c5299fe8d8857682220a96dd42057d5e41d6016 100644 (file)
--- a/include/wx/cocoa/dataobj2.h
+++ b/include/wx/cocoa/dataobj2.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/07/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DATAOBJ2_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DATAOBJ2_H__


@@ -15,7 +15,7 @@
 //=========================================================================
 // 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


@@ -23,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);


@@ -59,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