add SetCharIncludes and SetCharExcludes utilities to wxTextValidator; use iterators...

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

diff --git a/interface/wx/dataobj.h b/interface/wx/dataobj.h
index 830a4c1a9f4f21a3b0e3aca8defd27ac7d70fc09..346d553bfaeaf89412e8375326664d35a5ba3a47 100644 (file)
--- a/interface/wx/dataobj.h
+++ b/interface/wx/dataobj.h
@@ -80,7 +80,7 @@ public:
         object by pickling it first.
         @endWxPythonOnly
     */
-    virtual void SetData(size_t size, const void data);
+    virtual bool SetData(size_t size, const void* data);
 
     /**
         Like SetData(), but doesn't copy the data - instead the object takes
@@ -190,7 +190,7 @@ public:
         required and the data should be returned from the method as a string.
         @endWxPythonOnly
     */
-    virtual bool GetDataHere(void buf) const;
+    virtual bool GetDataHere(void* buf) const;
 
     /**
         Gets the size of our data. Must be implemented in the derived class if
@@ -214,7 +214,7 @@ public:
         string parameter rather than the two shown here.
         @endWxPythonOnly
     */
-    virtual bool SetData(size_t len, const void buf);
+    virtual bool SetData(size_t len, const void* buf);
 
     /**
         Sets the supported format.
@@ -547,6 +547,7 @@ public:
     {
         Get  = 0x01,    // format is supported by GetDataHere()
         Set  = 0x02     // format is supported by SetData()
+        Both = 0x03     // format is supported by both (unused currently)
     };
     @endcode
 
@@ -641,6 +642,14 @@ public:
 class wxDataObject
 {
 public:
+    enum Direction
+    {
+        /** Format is supported by GetDataHere() */
+        Get  = 0x01,
+        /** Format is supported by SetData() */
+        Set  = 0x02,
+    };
+
     /**
         Constructor.
     */
@@ -656,7 +665,8 @@ public:
         to by @a formats. There is enough space for GetFormatCount(dir) formats
         in it.
     */
-    virtual void GetAllFormats(wxDataFormat* formats, Direction dir = Get) const;
+    virtual void GetAllFormats(wxDataFormat* formats,
+                               Direction dir = Get) const = 0;
 
     /**
         The method will write the data of the format @a format in the buffer
@@ -689,5 +699,10 @@ public:
         @return @true on success, @false on failure.
     */
     virtual bool SetData(const wxDataFormat& format, size_t len, const void* buf);
+
+    /**
+       Returns true if this format is supported.
+    */
+    bool IsSupported(const wxDataFormat& format, Direction dir = Get) const;
 };