added missing button state

[wxWidgets.git] / wxPython / src / _dataobj.i

diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i
index fd6cd5c5b0a77f26505acb70ab703fb6edbcbac0..996469245c0664aa4eb0dad840dfd477205970a7 100644 (file)
--- a/wxPython/src/_dataobj.i
+++ b/wxPython/src/_dataobj.i
@@ -122,6 +122,9 @@ standard format).", "");
     DocDeclStr(
         void , SetId(const wxString& format),
         "Sets the format to be the custom format identified by the given name.", "");    
     DocDeclStr(
         void , SetId(const wxString& format),
         "Sets the format to be the custom format identified by the given name.", "");    

+
+    %property(Id, GetId, SetId, doc="See `GetId` and `SetId`");
+    %property(Type, GetType, SetType, doc="See `GetType` and `SetType`");

 };
 
 
 };
 
 


@@ -310,6 +313,11 @@ in the given direction.", "");
         }
     }
     
         }
     }
     

+    %property(AllFormats, GetAllFormats, doc="See `GetAllFormats`");
+    %property(DataHere, GetDataHere, doc="See `GetDataHere`");
+    %property(DataSize, GetDataSize, doc="See `GetDataSize`");
+    %property(FormatCount, GetFormatCount, doc="See `GetFormatCount`");
+    %property(PreferredFormat, GetPreferredFormat, doc="See `GetPreferredFormat`");

 
 };
 
 
 };
 


@@ -397,6 +405,7 @@ derived class if the object supports setting its data.
         }
     }
     
         }
     }
     

+    %property(Format, GetFormat, SetFormat, doc="See `GetFormat` and `SetFormat`");

 };
 
 
 };
 
 


@@ -410,7 +419,7 @@ public:
 
     DEC_PYCALLBACK_SIZET__const(GetDataSize);
     bool GetDataHere(void *buf) const;
 
     DEC_PYCALLBACK_SIZET__const(GetDataSize);
     bool GetDataHere(void *buf) const;

-    bool SetData(size_t len, const void *buf) const;
+    bool SetData(size_t len, const void *buf);

     PYPRIVATE;
 };
 
     PYPRIVATE;
 };
 


@@ -438,7 +447,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
     return rval;
 }
 
     return rval;
 }
 

-bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{
+bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) {

     // For this one we simply need to make a string from buf and len
     // and send it to the Python method.
     bool rval = false;
     // For this one we simply need to make a string from buf and len
     // and send it to the Python method.
     bool rval = false;


@@ -488,7 +497,7 @@ data structures.
 ");
 class wxPyDataObjectSimple : public wxDataObjectSimple {
 public:
 ");
 class wxPyDataObjectSimple : public wxDataObjectSimple {
 public:

-    %pythonAppend wxPyDataObjectSimple   "self._setCallbackInfo(self, PyDataObjectSimple)"
+    %pythonAppend wxPyDataObjectSimple   setCallbackInfo(PyDataObjectSimple)

 
     wxPyDataObjectSimple(const wxDataFormat& format = wxFormatInvalid);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     wxPyDataObjectSimple(const wxDataFormat& format = wxFormatInvalid);
     void _setCallbackInfo(PyObject* self, PyObject* _class);


@@ -524,6 +533,15 @@ public:
 the preferred object if preferred is True.", "");
     
     %cleardisown( wxDataObjectSimple *dataObject );
 the preferred object if preferred is True.", "");
     
     %cleardisown( wxDataObjectSimple *dataObject );

+
+    DocDeclStr(
+        wxDataFormat , GetReceivedFormat() const,
+        "Report the format passed to the `SetData` method.  This should be the
+format of the data object within the composite that recieved data from
+the clipboard or the DnD operation.  You can use this method to find
+out what kind of data object was recieved.", "");
+    
+    %property(ReceivedFormat, GetReceivedFormat, doc="See `GetReceivedFormat`");

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


@@ -567,6 +585,8 @@ text into the member variable. If you want to process the text on the
 fly you may wish to override this function (via
 `wx.PyTextDataObject`.)", "");
     
 fly you may wish to override this function (via
 `wx.PyTextDataObject`.)", "");
     

+    %property(Text, GetText, SetText, doc="See `GetText` and `SetText`");
+    %property(TextLength, GetTextLength, doc="See `GetTextLength`");

 };
 
 
 };
 
 


@@ -605,7 +625,7 @@ into the data object.", "");
 
 class wxPyTextDataObject : public wxTextDataObject {
 public:
 
 class wxPyTextDataObject : public wxTextDataObject {
 public:

-    %pythonAppend wxPyTextDataObject   "self._setCallbackInfo(self, PyTextDataObject)"
+    %pythonAppend wxPyTextDataObject   setCallbackInfo(PyTextDataObject)

 
     wxPyTextDataObject(const wxString& text = wxPyEmptyString);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     wxPyTextDataObject(const wxString& text = wxPyEmptyString);
     void _setCallbackInfo(PyObject* self, PyObject* _class);


@@ -641,6 +661,7 @@ internals. Use this method to get data in bitmap form from the
 when the data object receives data. Usually there will be no reason to
 override this function.", "");
     
 when the data object receives data. Usually there will be no reason to
 override this function.", "");
     

+    %property(Bitmap, GetBitmap, SetBitmap, doc="See `GetBitmap` and `SetBitmap`");

 };
 
 
 };
 
 


@@ -697,7 +718,7 @@ data on demand derive from this class and overload `GetBitmap`.", "");
 
 class wxPyBitmapDataObject : public wxBitmapDataObject {
 public:
 
 class wxPyBitmapDataObject : public wxBitmapDataObject {
 public:

-    %pythonAppend wxPyBitmapDataObject   "self._setCallbackInfo(self, PyBitmapDataObject)"
+    %pythonAppend wxPyBitmapDataObject   setCallbackInfo(PyBitmapDataObject)

 
     wxPyBitmapDataObject(const wxBitmap& bitmap = wxNullBitmap);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     wxPyBitmapDataObject(const wxBitmap& bitmap = wxNullBitmap);
     void _setCallbackInfo(PyObject* self, PyObject* _class);


@@ -730,6 +751,7 @@ public:
         void , AddFile(const wxString &filename),
         "Adds a file to the list of files represented by this data object.", "");
     
         void , AddFile(const wxString &filename),
         "Adds a file to the list of files represented by this data object.", "");
     

+    %property(Filenames, GetFilenames, doc="See `GetFilenames`");

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


@@ -791,6 +813,10 @@ public:
             return obj;
         }
     }
             return obj;
         }
     }

+
+    %property(Data, GetData, SetData, doc="See `GetData` and `SetData`");
+    %property(Size, GetSize, doc="See `GetSize`");
+

 };
 
 
 };
 
 


@@ -801,7 +827,7 @@ DocStr(wxURLDataObject,
 browsers such that it is able to be dragged to or from them.", "");
 class wxURLDataObject : public wxDataObject/*Composite*/ {
 public:
 browsers such that it is able to be dragged to or from them.", "");
 class wxURLDataObject : public wxDataObject/*Composite*/ {
 public:

-    wxURLDataObject();
+    wxURLDataObject(const wxString& url = wxPyEmptyString);

 
     DocDeclStr(
         wxString , GetURL(),
 
     DocDeclStr(
         wxString , GetURL(),


@@ -811,6 +837,7 @@ public:
         void , SetURL(const wxString& url),
         "Set the URL.", "");
     
         void , SetURL(const wxString& url),
         "Set the URL.", "");
     

+    %property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`");

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