removed platform specific #ifdefs around wxComboBox

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index ae1a30c870dbb71f4082626f4fac758aa258420c..5d80b6f16e83da95bd84b8016dcff699789b2df4 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -79,6 +79,8 @@ public:
     #include "wx/motif/dataform.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataform.h"
     #include "wx/motif/dataform.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataform.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/dataform.h"

 #elif defined(__WXPM__)
     #include "wx/os2/dataform.h"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/dataform.h"
 #endif


@@ -159,7 +161,7 @@ public:
 #elif defined(__WXQT__)
     #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXQT__)
     #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/dnd.h"
+    #include "wx/mac/dataobj.h"

 #elif defined(__WXPM__)
     #include "wx/os2/dataobj.h"
 #elif defined(__WXSTUBS__)
 #elif defined(__WXPM__)
     #include "wx/os2/dataobj.h"
 #elif defined(__WXSTUBS__)


@@ -317,15 +319,13 @@ public:
 private:
     wxString m_text;
 
 private:
     wxString m_text;
 

-#if defined(__VISAGECPP__)
-    // Virtual function hiding supression
-    size_t GetDataSize(const wxDataFormat& rFormat) const
-    { return(wxDataObjectSimple::GetDataSize(rFormat)); }
-    bool GetDataHere(const wxDataFormat& WXUNUSED(rFormat), void *pBuf) const
-    { return(GetDataHere(pBuf)); }
-    bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
-    { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
-#endif
+    // virtual function hiding supression
+    size_t GetDataSize(const wxDataFormat& format) const
+        { return(wxDataObjectSimple::GetDataSize(format)); }
+    bool GetDataHere(const wxDataFormat& format, void *pBuf) const
+        { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
+    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
+        { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }

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


@@ -374,14 +374,12 @@ public:
 protected:
     wxArrayString m_filenames;
 
 protected:
     wxArrayString m_filenames;
 

-#if defined(__VISAGECPP__)

 private:
     // Virtual function hiding supression
 private:
     // Virtual function hiding supression

-    size_t GetDataSize(const wxDataFormat& rFormat) const
-    { return(wxDataObjectSimple::GetDataSize(rFormat)); }
-    bool GetDataHere(const wxDataFormat& WXUNUSED(rformat), void* pBuf) const
-    { return(GetDataHere(pBuf)); }
-#endif
+    size_t GetDataSize(const wxDataFormat& format) const
+        { return(wxDataObjectSimple::GetDataSize(format)); }
+    bool GetDataHere(const wxDataFormat& format, void* pBuf) const
+        { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }

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


@@ -429,15 +427,13 @@ private:
     size_t m_size;
     void  *m_data;
 
     size_t m_size;
     void  *m_data;
 

-#if defined(__VISAGECPP__)
-    // Virtual function hiding supression
-    size_t GetDataSize(const wxDataFormat& rFormat) const
-    { return(wxDataObjectSimple::GetDataSize(rFormat)); }
-    bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const
-    { return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); }
-    bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
-    { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
-#endif
+    // virtual function hiding supression
+    size_t GetDataSize(const wxDataFormat& format) const
+        { return(wxDataObjectSimple::GetDataSize(format)); }
+    bool GetDataHere(const wxDataFormat& format, void* pBuf) const
+        { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
+    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
+        { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }

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


@@ -450,6 +446,8 @@ private:
     // #include "wx/motif/dataobj2.h" -- not yet
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj2.h"
     // #include "wx/motif/dataobj2.h" -- not yet
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj2.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/dataobj2.h"

 #elif defined(__WXPM__)
     #include "wx/os2/dataobj2.h"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/dataobj2.h"
 #endif