no changes, just remove #if'd out code

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index ec7b0d76a4bcf2f10a37b6af40b281408215b1f2..9421034bacc2622872229ba67af952377a566d6c 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -246,7 +246,7 @@ private:
     // the one and only format we support
     wxDataFormat m_format;
 
     // the one and only format we support
     wxDataFormat m_format;
 

-    DECLARE_NO_COPY_CLASS(wxDataObjectSimple)
+    wxDECLARE_NO_COPY_CLASS(wxDataObjectSimple);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -309,7 +309,7 @@ private:
 
     wxDataFormat m_receivedFormat;
 
 
     wxDataFormat m_receivedFormat;
 

-    DECLARE_NO_COPY_CLASS(wxDataObjectComposite)
+    wxDECLARE_NO_COPY_CLASS(wxDataObjectComposite);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -328,7 +328,7 @@ private:
     #if defined(__WXGTK20__)
         #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
     #elif defined(__WXMAC__)
     #if defined(__WXGTK20__)
         #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
     #elif defined(__WXMAC__)

-        #define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ
+        #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ

     #endif
 #endif // wxUSE_UNICODE
 
     #endif
 #endif // wxUSE_UNICODE
 


@@ -393,7 +393,7 @@ public:
 private:
     wxString m_text;
 
 private:
     wxString m_text;
 

-    DECLARE_NO_COPY_CLASS(wxTextDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxTextDataObject);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -418,7 +418,7 @@ public:
 protected:
     wxBitmap m_bitmap;
 
 protected:
     wxBitmap m_bitmap;
 

-    DECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -440,7 +440,7 @@ public:
 protected:
     wxArrayString m_filenames;
 
 protected:
     wxArrayString m_filenames;
 

-    DECLARE_NO_COPY_CLASS(wxFileDataObjectBase)
+    wxDECLARE_NO_COPY_CLASS(wxFileDataObjectBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -501,7 +501,7 @@ private:
     size_t m_size;
     void  *m_data;
 
     size_t m_size;
     void  *m_data;
 

-    DECLARE_NO_COPY_CLASS(wxCustomDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxCustomDataObject);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------