Patches, updates from contributors, etc.

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

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index e31bed8bc25b6ebf12050147b490b1d9ad384b37..3eb8574c2223dd1609c496f8eb47d22c95471d65 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -65,7 +65,8 @@ PyObject* wxPyConstructObject(void* ptr,
                               PyObject* klass,
                               int setThisOwn=0);
 PyObject*  wxPyClassExists(const char* className);
                               PyObject* klass,
                               int setThisOwn=0);
 PyObject*  wxPyClassExists(const char* className);

-PyObject*  wxPyMake_wxObject(wxObject* source);
+PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE);
+PyObject*  wxPyMake_wxSizer(wxSizer* source);

 void       wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
 
 PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
 void       wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
 
 PyObject* wxPy_ConvertList(wxListBase* list, const char* className);


@@ -151,7 +152,7 @@ bool _2int_seq_helper(PyObject* source, int* i1, int* i2);
 bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
 
 
 bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
 
 

-PyObject* wxArrayString2PyList_helper(const wxArrayString& app);
+PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);

 
 
 #define RETURN_NONE()   { Py_INCREF(Py_None); return Py_None; }
 
 
 #define RETURN_NONE()   { Py_INCREF(Py_None); return Py_None; }


@@ -284,9 +285,10 @@ struct wxPyCoreAPI {
     void        (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
 
     PyObject*   (*p_wxPyClassExists)(const char* className);
     void        (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
 
     PyObject*   (*p_wxPyClassExists)(const char* className);

-    PyObject*   (*p_wxPyMake_wxObject)(wxObject* source);
+    PyObject*   (*p_wxPyMake_wxObject)(wxObject* source, bool checkEvtHandler);
+    PyObject*   (*p_wxPyMake_wxSizer)(wxSizer* source);

     void        (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
     void        (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);

-
+    PyObject*   (*p_wxArrayString2PyList_helper)(const wxArrayString& arr);

 };
 
 #ifdef wxPyUSE_EXPORT
 };
 
 #ifdef wxPyUSE_EXPORT