added a note about the constraints being deprecated

[wxWidgets.git] / wxPython / src / helpers.h

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index a177f4c7f39264b28cabde0406f8475e75efd27e..64d394ef00283aaa61a054b0b537f244560f5adf 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -114,7 +114,8 @@ PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);
 PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
 
 
 PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
 
 

-#define RETURN_NONE()   { Py_INCREF(Py_None); return Py_None; }
+#define RETURN_NONE()               { Py_INCREF(Py_None); return Py_None; }
+#define DECLARE_DEF_STRING(name)    static wxString wxPy##name(wx##name)

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -1145,10 +1146,10 @@ public:
     wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {          \
         int rval=0;                                                             \
         bool found;                                                             \
     wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {          \
         int rval=0;                                                             \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads();                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b, c);                                     \
         return (wxDragResult)rval;                                              \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b, c);                                     \
         return (wxDragResult)rval;                                              \


@@ -1164,20 +1165,20 @@ public:
 
 #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME)         \
     wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) {        \
 
 #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME)         \
     wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) {        \

-        wxPyBeginBlockThreads();                    \
+        wxPyBeginBlockThreads();                                        \

         wxFSFile* rval=0;                                               \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
             PyObject* ro;                                               \
             PyObject* obj = wxPyMake_wxObject(&a);                      \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",\
         wxFSFile* rval=0;                                               \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                  \
             PyObject* ro;                                               \
             PyObject* obj = wxPyMake_wxObject(&a);                      \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",\

-                                          obj, wx2PyString));           \
+                                          obj, wx2PyString(b)));        \

             if (ro) {                                                   \
                 SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p");      \
                 Py_DECREF(ro);                                          \
             }                                                           \
             Py_DECREF(obj);                                             \
         }                                                               \
             if (ro) {                                                   \
                 SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p");      \
                 Py_DECREF(ro);                                          \
             }                                                           \
             Py_DECREF(obj);                                             \
         }                                                               \

-        wxPyEndBlockThreads();                                     \
+        wxPyEndBlockThreads();                                          \

         return rval;                                                    \
     };
 
         return rval;                                                    \
     };