X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcda20eb04df6af04b833519262f9fa76c86c4b9..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk/dataobj2.h

diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h
index 58dd22c57a..27fb43eb53 100644
--- a/include/wx/gtk/dataobj2.h
+++ b/include/wx/gtk/dataobj2.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/dataobj2.h
+// Name:        wx/gtk/dataobj2.h
 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Robert Roebling
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
@@ -49,7 +49,6 @@ public:
     }
 
 protected:
-    void Init() { m_pngData = (void *)NULL; m_pngSize = 0; }
     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 
@@ -57,6 +56,9 @@ protected:
     void       *m_pngData;
 
     void DoConvertToPng();
+
+private:
+    void Init() { m_pngData = NULL; m_pngSize = 0; }
 };
 
 // ----------------------------------------------------------------------------
@@ -93,34 +95,19 @@ public:
 // wxURLDataObject is a specialization of wxDataObject for URLs
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite
 {
 public:
     wxURLDataObject(const wxString& url = wxEmptyString);
 
-    wxString GetURL() const { return m_url; }
-    void SetURL(const wxString& url) { m_url = url; }
-
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
+    wxString GetURL() const;
+    void SetURL(const wxString& url);
 
 private:
-    wxString m_url;
+    class wxTextURIListDataObject* const m_dobjURIList;
+    wxTextDataObject* const m_dobjText;
+
+    wxDECLARE_NO_COPY_CLASS(wxURLDataObject);
 };