Cleanup of wxSocket::_Wait():

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

diff --git a/interface/wx/dataobj.h b/interface/wx/dataobj.h
index fd5035b5eea8e036fc9a601567be18c258562f67..0a3e9618453850cfbb121892beb043692a34d435 100644 (file)
--- a/interface/wx/dataobj.h
+++ b/interface/wx/dataobj.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxCustomDataObject
-    @wxheader{dataobj.h}
 
     wxCustomDataObject is a specialization of wxDataObjectSimple for some
     application-specific data in arbitrary (either custom or one of the
@@ -92,14 +91,13 @@ public:
         object by pickling it first.
         @endWxPythonOnly
     */
-    virtual void TakeData(size_t size, const void data);
+    void TakeData(size_t size, void* data);
 };
 
 
 
 /**
     @class wxDataObjectComposite
-    @wxheader{dataobj.h}
 
     wxDataObjectComposite is the simplest wxDataObject derivation which may be
     used to support multiple formats. It contains several wxDataObjectSimple
@@ -130,7 +128,7 @@ public:
         Adds the @a dataObject to the list of supported objects and it becomes
         the preferred object if @a preferred is @true.
     */
-    void Add(wxDataObjectSimple dataObject, bool preferred = false);
+    void Add(wxDataObjectSimple* dataObject, bool preferred = false);
 
     /**
         Report the format passed to the SetData() method.  This should be the
@@ -145,7 +143,6 @@ public:
 
 /**
     @class wxDataObjectSimple
-    @wxheader{dataobj.h}
 
     This is the simplest possible implementation of the wxDataObject class. The
     data object of (a class derived from) this class only supports one format,
@@ -205,7 +202,7 @@ public:
         Returns the (one and only one) format supported by this object. It is
         assumed that the format is supported in both directions.
     */
-    const wxDataFormat GetFormat() const;
+    const wxDataFormat& GetFormat() const;
 
     /**
         Copy the data from the buffer, return @true on success. Must be
@@ -229,7 +226,6 @@ public:
 
 /**
     @class wxBitmapDataObject
-    @wxheader{dataobj.h}
 
     wxBitmapDataObject is a specialization of wxDataObject for bitmap data. It
     can be used without change to paste data into the wxClipboard or a
@@ -281,7 +277,6 @@ public:
 
 /**
     @class wxDataFormat
-    @wxheader{dataobj.h}
 
     A wxDataFormat is an encapsulation of a platform-specific format handle
     which is used by the system for the clipboard and drag and drop operations.
@@ -357,7 +352,7 @@ public:
     /**
         Returns the platform-specific number identifying the format.
     */
-    NativeFormat GetType() const;
+    wxDataFormatId GetType() const;
 
     /**
         Sets the format to be the custom format identified by the given name.
@@ -368,7 +363,7 @@ public:
         Sets the format to the given value, which should be one of wxDF_XXX
         constants.
     */
-    void SetType(NativeFormat format);
+    void SetType(wxDataFormatId type);
 
     /**
         Returns @true if the formats are different.
@@ -385,7 +380,6 @@ public:
 
 /**
     @class wxURLDataObject
-    @wxheader{dataobj.h}
 
     wxURLDataObject is a wxDataObject containing an URL and can be used e.g.
     when you need to put an URL on or retrieve it from the clipboard:
@@ -426,7 +420,6 @@ public:
 
 /**
     @class wxDataObject
-    @wxheader{dataobj.h}
 
     A wxDataObject represents data that can be copied to or from the clipboard,
     or dragged and dropped. The important thing about wxDataObject is that this
@@ -549,7 +542,7 @@ public:
     /**
         Destructor.
     */
-    ~wxDataObject();
+    virtual ~wxDataObject();
 
     /**
         Copy all supported formats in the given direction to the array pointed
@@ -563,25 +556,25 @@ public:
         The method will write the data of the format @a format in the buffer
         @a buf and return @true on success, @false on failure.
     */
-    virtual bool GetDataHere(const wxDataFormat& format, void buf) const;
+    virtual bool GetDataHere(const wxDataFormat& format, void* buf) const = 0;
 
     /**
         Returns the data size of the given format @a format.
     */
-    virtual size_t GetDataSize(const wxDataFormat& format) const;
+    virtual size_t GetDataSize(const wxDataFormat& format) const = 0;
 
     /**
         Returns the number of available formats for rendering or setting the
         data.
     */
-    virtual size_t GetFormatCount(Direction dir = Get) const;
+    virtual size_t GetFormatCount(Direction dir = Get) const = 0;
 
     /**
         Returns the preferred format for either rendering the data (if @a dir
         is @c Get, its default value) or for setting it. Usually this will be
         the native format of the wxDataObject.
     */
-    virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
+    virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const = 0;
 
     /**
         Set the data in the format @a format of the length @a len provided in
@@ -597,7 +590,6 @@ public:
 
 /**
     @class wxTextDataObject
-    @wxheader{dataobj.h}
 
     wxTextDataObject is a specialization of wxDataObject for text data. It can
     be used without change to paste data into the wxClipboard or a
@@ -663,7 +655,6 @@ public:
 
 /**
     @class wxFileDataObject
-    @wxheader{dataobj.h}
 
     wxFileDataObject is a specialization of wxDataObject for file names. The
     program works with it just as if it were a list of absolute file names, but
@@ -695,11 +686,11 @@ public:
         Adds a file to the file list represented by this data object (Windows
         only).
     */
-    virtual void AddFile(const wxString& file);
+    void AddFile(const wxString& file);
 
     /**
         Returns the array of file names.
     */
-    const wxArrayString GetFilenames() const;
+    const wxArrayString& GetFilenames() const;
 };