Document wxKill(wxSIGTERM) reliance on having an open window in wxMSW.

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

diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h
index 250305b177805eef8caa4d097d761f1335bf5545..27fb43eb53c7c185df4d6b97c9855fc262e2c330 100644 (file)
--- 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)
 // 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:
     }
 
 protected:

-    void Init() { m_pngData = (void *)NULL; m_pngSize = 0; }

     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 
     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 


@@ -57,6 +56,9 @@ protected:
     void       *m_pngData;
 
     void DoConvertToPng();
     void       *m_pngData;
 
     void DoConvertToPng();

+
+private:
+    void Init() { m_pngData = NULL; m_pngSize = 0; }

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


@@ -93,20 +95,19 @@ public:
 // wxURLDataObject is a specialization of wxDataObject for URLs
 // ----------------------------------------------------------------------------
 
 // 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);
 
 {
 public:
     wxURLDataObject(const wxString& url = wxEmptyString);
 

-    wxString GetURL() const { return m_url; }
-    void SetURL(const wxString& url) { m_url = url; }
-    
+    wxString GetURL() const;
+    void SetURL(const wxString& url);
+

 private:
 private:

-    wxString m_url;
+    class wxTextURIListDataObject* const m_dobjURIList;
+    wxTextDataObject* const m_dobjText;

 
 

-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
+    wxDECLARE_NO_COPY_CLASS(wxURLDataObject);

 };
 
 
 };