Move wxPyCallback back to derive from wxObject

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

diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i
index cf6baf07ef77ae11778a4fe0b080003e47c83503..e2d83d1eb3618092f7c6dd571896d81d77fdb465 100644 (file)
--- a/wxPython/src/_dataobj.i
+++ b/wxPython/src/_dataobj.i
@@ -71,7 +71,7 @@ The standard format IDs are:
                         Windows and non-unicode builds
     ================    =====================================
 
                         Windows and non-unicode builds
     ================    =====================================
 

-Aside the standard formats, the application may also use custom
+Besies the standard formats, the application may also use custom

 formats which are identified by their names (strings) and not numeric
 identifiers. Although internally custom format must be created (or
 registered) first, you shouldn\'t care about it because it is done
 formats which are identified by their names (strings) and not numeric
 identifiers. Although internally custom format must be created (or
 registered) first, you shouldn\'t care about it because it is done


@@ -247,7 +247,7 @@ in the given direction.", "");
             PyObject* list = PyList_New(count);
             for (size_t i=0; i<count; i++) {
                 wxDataFormat* format = new wxDataFormat(formats[i]);
             PyObject* list = PyList_New(count);
             for (size_t i=0; i<count; i++) {
                 wxDataFormat* format = new wxDataFormat(formats[i]);

-                PyObject* obj = wxPyConstructObject((void*)format, wxT("wxDataFormat"), True);
+                PyObject* obj = wxPyConstructObject((void*)format, wxT("wxDataFormat"), true);

                 PyList_Append(list, obj);
                 Py_DECREF(obj);
             }            
                 PyList_Append(list, obj);
                 Py_DECREF(obj);
             }            


@@ -308,7 +308,7 @@ in the given direction.", "");
             else {
                 // raise a TypeError if not a string
                 PyErr_SetString(PyExc_TypeError, "String expected.");
             else {
                 // raise a TypeError if not a string
                 PyErr_SetString(PyExc_TypeError, "String expected.");

-                rval = False;
+                rval = false;

             }
             wxPyEndBlockThreads(blocked);
             return rval;
             }
             wxPyEndBlockThreads(blocked);
             return rval;


@@ -395,7 +395,7 @@ derived class if the object supports setting its data.
             else {
                 // raise a TypeError if not a string
                 PyErr_SetString(PyExc_TypeError, "String expected.");
             else {
                 // raise a TypeError if not a string
                 PyErr_SetString(PyExc_TypeError, "String expected.");

-                rval = False;
+                rval = false;

             }
             wxPyEndBlockThreads(blocked);
             return rval;
             }
             wxPyEndBlockThreads(blocked);
             return rval;


@@ -427,7 +427,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
     // return either a string or None and then act appropriately with the
     // C++ version.
 
     // return either a string or None and then act appropriately with the
     // C++ version.
 

-    bool rval = False;
+    bool rval = false;

     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) {
         PyObject* ro;
     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) {
         PyObject* ro;


@@ -446,7 +446,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
 bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{
     // For this one we simply need to make a string from buf and len
     // and send it to the Python method.
 bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{
     // For this one we simply need to make a string from buf and len
     // and send it to the Python method.

-    bool rval = False;
+    bool rval = false;

     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "SetData")) {
         PyObject* data = PyString_FromStringAndSize((char*)buf, len);
     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "SetData")) {
         PyObject* data = PyString_FromStringAndSize((char*)buf, len);


@@ -524,7 +524,7 @@ public:
     %apply SWIGTYPE *DISOWN { wxDataObjectSimple *dataObject };
     
     DocDeclStr(
     %apply SWIGTYPE *DISOWN { wxDataObjectSimple *dataObject };
     
     DocDeclStr(

-        void , Add(wxDataObjectSimple *dataObject, bool preferred = False),
+        void , Add(wxDataObjectSimple *dataObject, bool preferred = false),

         "Adds the dataObject to the list of supported objects and it becomes
 the preferred object if preferred is True.", "");
     
         "Adds the dataObject to the list of supported objects and it becomes
 the preferred object if preferred is True.", "");
     


@@ -683,7 +683,7 @@ wxBitmap wxPyBitmapDataObject::GetBitmap() const {
 void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) {
 void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) {

-        PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), False);
+        PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), false);

         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo));
         Py_DECREF(bo);
     }
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo));
         Py_DECREF(bo);
     }


@@ -717,13 +717,7 @@ file names. The program works with it just as if it were a list of
 absolute file names, but internally it uses the same format as
 Explorer and other compatible programs under Windows or GNOME/KDE
 filemanager under Unix which makes it possible to receive files from
 absolute file names, but internally it uses the same format as
 Explorer and other compatible programs under Windows or GNOME/KDE
 filemanager under Unix which makes it possible to receive files from

-them using this class.
-
-:Warning: Under all non-Windows platforms this class is currently
-    \"input-only\", i.e. you can receive the files from another
-    application, but copying (or dragging) file(s) from a wxWidgets
-    application is not currently supported.
-", "");
+them using this class.", "");

 
 class wxFileDataObject : public wxDataObjectSimple
 {
 
 class wxFileDataObject : public wxDataObjectSimple
 {


@@ -754,8 +748,15 @@ data object.", "");
 
 class wxCustomDataObject : public wxDataObjectSimple {
 public:
 
 class wxCustomDataObject : public wxDataObjectSimple {
 public:

-    wxCustomDataObject(const wxDataFormat& format = wxFormatInvalid);
-
+    %nokwargs wxCustomDataObject;
+    wxCustomDataObject(const wxDataFormat& format);
+    %extend {
+        wxCustomDataObject(const wxString& formatName) {
+            return new wxCustomDataObject(wxDataFormat(formatName));
+        }
+    }
+    wxCustomDataObject();
+    

     
     DocAStr(SetData,
             "SetData(self, String data) -> bool",
     
     DocAStr(SetData,
             "SetData(self, String data) -> bool",


@@ -770,7 +771,7 @@ public:
             else {
                 // raise a TypeError if not a string
                 PyErr_SetString(PyExc_TypeError, "String expected.");
             else {
                 // raise a TypeError if not a string
                 PyErr_SetString(PyExc_TypeError, "String expected.");

-                rval = False;
+                rval = false;

             }
             wxPyEndBlockThreads(blocked);
             return rval;
             }
             wxPyEndBlockThreads(blocked);
             return rval;


@@ -791,7 +792,8 @@ public:
             PyObject* obj;
             bool blocked = wxPyBeginBlockThreads();
             obj = PyString_FromStringAndSize((char*)self->GetData(), self->GetSize());
             PyObject* obj;
             bool blocked = wxPyBeginBlockThreads();
             obj = PyString_FromStringAndSize((char*)self->GetData(), self->GetSize());

-            wxPyEndBlockThreads(blocked);      
+            wxPyEndBlockThreads(blocked);
+            return obj;

         }
     }
 };
         }
     }
 };