Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index fad2dc666463b7055f59b052c7df9c05fbd61386..95e4296b55b3bb0604a333262c7e1c2328c59946 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -81,7 +81,9 @@ private:
 
 class WXDLLEXPORT wxPrivateDataObject : public wxDataObject
 {
+#ifdef __WXGTK__
     DECLARE_DYNAMIC_CLASS( wxPrivateDataObject )
+#endif
 
 public:
     wxPrivateDataObject();
@@ -109,7 +111,7 @@ public:
     wxString GetId() const { return m_format.GetId(); }
 
     // implement the base class pure virtuals
-    virtual wxDataFormatId GetPreferredFormat() const
+    virtual wxDataFormat GetPreferredFormat() const
         { return m_format; }
     virtual bool IsSupportedFormat(wxDataFormat format) const
         { return m_format == format; }
@@ -118,11 +120,8 @@ public:
     virtual void GetDataHere(void *dest) const
         { WriteData(dest); }
 
-protected:
     // the function which really copies the data - called by WriteData() above
     // and uses GetSize() to get the size of the data
-    //
-    // VZ: I really wonder why do we need it
     void WriteData( const void *data, void *dest ) const;
 
 private: