X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cf4100fc8ab4e662f419af2eaa220081e0c2806..093d3ff1f77c9ff8c1b66ebf43464429c583b044:/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index 7b8270750c..3a2f753b80 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -43,6 +43,7 @@ private: #define SWIG_TypeCast SWIG_Python_TypeCast #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast #define SWIG_TypeName SWIG_Python_TypeName +#define SWIG_TypePrettyName SWIG_Python_TypePrettyName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData #define SWIG_PackData SWIG_Python_PackData @@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); +SWIGIMPORT(const char *) SWIG_TypePrettyName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); @@ -123,6 +125,7 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); } #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -133,8 +136,6 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); * ************************************************************************/ -#include "Python.h" - #ifdef __cplusplus extern "C" { #endif @@ -204,6 +205,7 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #endif + /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxEditableListBox swig_types[0] @@ -250,47 +252,64 @@ static swig_type_info *swig_types[33]; #define SWIG_name "_gizmos" -/* Auxiliar swig macros */ +/* Auxiliar swig macros that appear in the header */ + +#define SWIG_OLDOBJ 1 +#define SWIG_NEWOBJ SWIG_OLDOBJ + 1 +#define SWIG_PYSTR SWIG_NEWOBJ + 1 #ifdef __cplusplus #define SWIGSTATICINLINE(a) static inline a #define SWIGSTATIC(a) static a -#define swig_new_array(type, size) (new type[(size)]) +#define swig_new_array(size,Type) (new Type[(size)]) +#define swig_delete(cptr) delete cptr #define swig_delete_array(cptr) delete[] cptr -#define swig_const_cast(type,a) const_cast(a) -#define swig_static_cast(type,a) static_cast(a) -#define swig_reinterpret_cast(type,a) reinterpret_cast(a) - -#ifdef HAVE_NUMERIC_CAST -#define swig_numeric_cast(type,a) numeric_cast(a) -#else -#define swig_numeric_cast(type,a) static_cast(a) -#endif +#define swig_const_cast(a,Type) const_cast(a) +#define swig_static_cast(a,Type) static_cast(a) +#define swig_reinterpret_cast(a,Type) reinterpret_cast(a) +#define swig_new_copy(ptr,Type) (new Type(*ptr)) +#define swig_numeric_cast(a,Type) static_cast(a) #else /* C case */ #define SWIGSTATICINLINE(a) static a #define SWIGSTATIC(a) static a -#define swig_new_array(type, size) ((type*) malloc((size)*sizeof(type))) +#define swig_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type))) +#define swig_delete(cptr) free((char*)cptr) #define swig_delete_array(cptr) free((char*)cptr) -#define swig_const_cast(type,a) (type)(a) -#define swig_static_cast(type,a) (type)(a) -#define swig_reinterpret_cast(type,a) (type)(a) -#define swig_numeric_cast(type,a) (type)(a) +#define swig_const_cast(a,Type) (Type)(a) +#define swig_static_cast(a,Type) (Type)(a) +#define swig_reinterpret_cast(a,Type) (Type)(a) +#define swig_numeric_cast(a,Type) (Type)(a) +#define swig_new_copy(ptr,Type) ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type))) #endif /* __cplusplus */ -#define SWIG_FromSignedChar PyInt_FromLong -#define SWIG_FromUnsignedChar PyInt_FromLong -#define SWIG_FromShort PyInt_FromLong -#define SWIG_FromUnsignedShort PyInt_FromLong -#define SWIG_FromInt PyInt_FromLong -#define SWIG_FromLong PyInt_FromLong -#define SWIG_FromFloat PyFloat_FromDouble -#define SWIG_FromDouble PyFloat_FromDouble -#define SWIG_FromFloat PyFloat_FromDouble -#define SWIG_FromDouble PyFloat_FromDouble +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_signed_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_int PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_long PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_float PyFloat_FromDouble +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_double PyFloat_FromDouble +/*@@*/ #include "wx/wxPython/wxPython.h" @@ -317,81 +336,120 @@ static swig_type_info *swig_types[33]; #include -SWIGSTATICINLINE(long) -SWIG_CheckLongInRange(long value, const char* type, - long min_value, long max_value) +SWIGSTATICINLINE(int) + SWIG_CheckLongInRange(long value, long min_value, long max_value, + const char *errmsg) { - if (!PyErr_Occurred()) { - if (value < min_value) { - PyObject *err = - PyString_FromFormat("value %ld is less than '%s' minimum %ld", - value, type, min_value); - - PyErr_SetObject(PyExc_OverflowError, err); - Py_DECREF(err); - } else if (value > max_value) { - PyObject *err = - PyString_FromFormat("value %ld is greater than '%s' maximum %ld", - value, type, max_value); - PyErr_SetObject(PyExc_OverflowError, err); - Py_DECREF(err); + if (value < min_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %ld is less than '%s' minimum %ld", + value, errmsg, min_value); + } + return 0; + } else if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %ld is greater than '%s' maximum %ld", + value, errmsg, max_value); } + return 0; } - return value; + return 1; } -SWIGSTATICINLINE(long) -SWIG_AsLong(PyObject * obj) +// See my_fragments.i +SWIGSTATICINLINE(int) +SWIG_AsVal_long(PyObject* obj, long* val) { - if (PyNumber_Check(obj)) - return PyInt_AsLong(obj); + if (PyNumber_Check(obj)) { + if (val) *val = PyInt_AsLong(obj); + return 1; + } else { PyObject* errmsg = PyString_FromFormat("Expected number, got %s", obj->ob_type->tp_name); PyErr_SetObject(PyExc_TypeError, errmsg); Py_DECREF(errmsg); - return 0; } + return 0; } #if INT_MAX != LONG_MAX SWIGSTATICINLINE(int) -SWIG_AsInt(PyObject *obj) + SWIG_AsVal_int(PyObject *obj, int *val) { - return swig_numeric_cast(int, - SWIG_CheckLongInRange(SWIG_AsLong(obj), - "int", INT_MIN, INT_MAX)); + const char* errmsg = val ? "int" : 0; + long v; + if (SWIG_AsVal_long(obj, &v)) { + if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) { + if (val) *val = swig_numeric_cast(v, int); + return 1; + } else { + return 0; + } + } else { + PyErr_Clear(); + } + if (val) { + PyErr_SetString(PyExc_TypeError, "an int is expected"); + } + return 0; } #else -#define SWIG_AsInt SWIG_AsLong +SWIGSTATICINLINE(int) + SWIG_AsVal_int(PyObject *obj, int *val) +{ + return SWIG_AsVal_long(obj,(long*)val); +} #endif SWIGSTATICINLINE(int) -SWIG_CheckInt(PyObject* obj) +SWIG_As_int(PyObject* obj) { - SWIG_AsInt(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; + int v; + if (!SWIG_AsVal_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(int)); } + return v; } -SWIGSTATICINLINE(int) -SWIG_CheckLong(PyObject* obj) +SWIGSTATICINLINE(long) +SWIG_As_long(PyObject* obj) { - SWIG_AsLong(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; + long v; + if (!SWIG_AsVal_long(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(long)); } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_int(PyObject* obj) +{ + return SWIG_AsVal_int(obj, (int*)0); +} + + +SWIGSTATICINLINE(int) +SWIG_Check_long(PyObject* obj) +{ + return SWIG_AsVal_long(obj, (long*)0); } PyObject *wxEditableListBox_GetStrings(wxEditableListBox *self){ @@ -418,8 +476,8 @@ public: bool blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) { PyObject* dcobj = wxPyMake_wxObject(&dc,false); - PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), False); - PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), False); + PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), false); + PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), false); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj)); Py_DECREF(dcobj); Py_DECREF(idobj); @@ -434,60 +492,97 @@ public: }; +SWIGSTATICINLINE(int) + SWIG_AsVal_bool(PyObject *obj, bool *val) +{ + /* if (val) *val = PyObject_IsTrue(obj); return 1; */ + if (obj == Py_True) { + if (val) *val = true; + return 1; + } + if (obj == Py_False) { + if (val) *val = false; + return 1; + } + int res = 0; + if (SWIG_AsVal_int(obj, &res)) { + if (val) *val = (bool)res; + return 1; + } + if (val) { + PyErr_SetString(PyExc_TypeError, "a bool is expected"); + } + return 0; +} + + SWIGSTATICINLINE(bool) -SWIG_AsBool(PyObject *obj) +SWIG_As_bool(PyObject* obj) +{ + bool v; + if (!SWIG_AsVal_bool(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(bool)); + } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_bool(PyObject* obj) { - return PyObject_IsTrue(obj) ? true : false; + return SWIG_AsVal_bool(obj, (bool*)0); } +// See my_fragments.i SWIGSTATICINLINE(int) -SWIG_CheckBool(PyObject* obj) +SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { - SWIG_AsBool(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { + long v = 0; + if (SWIG_AsVal_long(obj, &v) && v < 0) { + PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type"); + return 0; + } + else if (val) + *val = (unsigned long)v; return 1; - } } SWIGSTATICINLINE(unsigned long) -SWIG_AsUnsignedLong(PyObject * obj) +SWIG_As_unsigned_SS_long(PyObject* obj) { - if (PyLong_Check(obj)) { - return PyLong_AsUnsignedLong(obj); - } else { - long i = SWIG_AsLong(obj); - if ( !PyErr_Occurred() && (i < 0)) { - PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type"); - } - return i; + unsigned long v; + if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(unsigned long)); } + return v; } - + SWIGSTATICINLINE(int) -SWIG_CheckUnsignedLong(PyObject* obj) +SWIG_Check_unsigned_SS_long(PyObject* obj) { - SWIG_AsUnsignedLong(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; - } + return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0); } SWIGSTATICINLINE(PyObject* ) -SWIG_FromUnsignedLong(unsigned long value) + SWIG_From_unsigned_SS_long(unsigned long value) { return (value > LONG_MAX) ? PyLong_FromUnsignedLong(value) - : PyInt_FromLong(swig_numeric_cast(long,value)); + : PyInt_FromLong(swig_numeric_cast(value,long)); } // C++ version of Python aware control @@ -528,52 +623,81 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl) #if UINT_MAX < LONG_MAX -#define SWIG_FromUnsignedInt SWIG_FromLong +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_long +/*@@*/ #else -#define SWIG_FromUnsignedInt SWIG_FromUnsignedLong +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long +/*@@*/ #endif -SWIGSTATICINLINE(unsigned long) -SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type, - unsigned long max_value) +SWIGSTATICINLINE(int) + SWIG_CheckUnsignedLongInRange(unsigned long value, + unsigned long max_value, + const char *errmsg) { - if (!PyErr_Occurred()) { - if (value > max_value) { - PyObject *err = - PyString_FromFormat("value %ld is greater than '%s' minimum %ld", - value, type, max_value); - PyErr_SetObject(PyExc_OverflowError, err); - Py_DECREF(err); + if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %ld is greater than '%s' minimum %ld", + value, errmsg, max_value); } + return 0; } - return value; -} + return 1; + } #if UINT_MAX != ULONG_MAX -SWIGSTATICINLINE(unsigned int) -SWIG_AsUnsignedInt(PyObject *obj) +SWIGSTATICINLINE(int) + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) { - return swig_numeric_cast(unsigned int, - SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj), - "unsigned int", UINT_MAX)); + const char* errmsg = val ? "unsigned int" : 0; + unsigned long v; + if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { + if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { + if (val) *val = swig_numeric_cast(v, unsigned int); + return 1; + } + } else { + PyErr_Clear(); + } + if (val) { + PyErr_SetString(PyExc_TypeError, "an unsigned int is expected"); + } + return 0; } #else -#define SWIG_AsUnsignedInt SWIG_AsUnsignedLong +SWIGSTATICINLINE(unsigned int) + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); +} #endif -SWIGSTATICINLINE(int) -SWIG_CheckUnsignedInt(PyObject* obj) +SWIGSTATICINLINE(unsigned int) +SWIG_As_unsigned_SS_int(PyObject* obj) { - SWIG_AsUnsignedInt(obj); - if (PyErr_Occurred()) { - PyErr_Clear(); - return 0; - } else { - return 1; + unsigned int v; + if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. the other + solution is throw an exception, but since this code should work + with plain C .... + */ + memset((void*)&v, 0, sizeof(unsigned int)); } + return v; +} + + +SWIGSTATICINLINE(int) +SWIG_Check_unsigned_SS_int(PyObject* obj) +{ + return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); } wxString wxPyTreeListCtrl_GetItemText(wxPyTreeListCtrl *self,wxTreeItemId const &item,int column){ @@ -631,7 +755,7 @@ PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){ num = self->GetSelections(array); for (x=0; x < num; x++) { wxTreeItemId *tii = new wxTreeItemId(array.Item(x)); - PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), True); + PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true); PyList_Append(rval, item); } wxPyEndBlockThreads(blocked); @@ -642,7 +766,7 @@ PyObject *wxPyTreeListCtrl_GetFirstChild(wxPyTreeListCtrl *self,wxTreeItemId con wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(blocked); return tup; @@ -651,27 +775,27 @@ PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItemId cons wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); bool blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True)); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); wxPyEndBlockThreads(blocked); return tup; } -static PyObject* t_output_helper(PyObject* target, PyObject* o) { + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - + if (!target) { target = o; } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); - } + } o3 = PyTuple_New(1); PyTuple_SetItem(o3, 0, o); @@ -681,7 +805,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { Py_DECREF(o3); } return target; -} + } + PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly){ wxRect rect; @@ -699,7 +824,7 @@ PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId c #ifdef __cplusplus extern "C" { #endif -static int _wrap_DynamicSashNameStr_set(PyObject *_val) { +static int _wrap_DynamicSashNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable DynamicSashNameStr is read-only."); return 1; } @@ -719,7 +844,7 @@ static PyObject *_wrap_DynamicSashNameStr_get() { } -static int _wrap_EditableListBoxNameStr_set(PyObject *_val) { +static int _wrap_EditableListBoxNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable EditableListBoxNameStr is read-only."); return 1; } @@ -739,7 +864,7 @@ static PyObject *_wrap_EditableListBoxNameStr_get() { } -static int _wrap_TreeListCtrlNameStr_set(PyObject *_val) { +static int _wrap_TreeListCtrlNameStr_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TreeListCtrlNameStr is read-only."); return 1; } @@ -759,7 +884,7 @@ static PyObject *_wrap_TreeListCtrlNameStr_get() { } -static PyObject *_wrap_new_DynamicSashSplitEvent(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_DynamicSashSplitEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxObject *arg1 = (wxObject *) 0 ; wxDynamicSashSplitEvent *result; @@ -785,14 +910,14 @@ static PyObject *_wrap_new_DynamicSashSplitEvent(PyObject *self, PyObject *args, } -static PyObject * DynamicSashSplitEvent_swigregister(PyObject *self, PyObject *args) { +static PyObject * DynamicSashSplitEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; SWIG_TypeClientData(SWIGTYPE_p_wxDynamicSashSplitEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_DynamicSashUnifyEvent(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_DynamicSashUnifyEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxObject *arg1 = (wxObject *) 0 ; wxDynamicSashUnifyEvent *result; @@ -818,14 +943,14 @@ static PyObject *_wrap_new_DynamicSashUnifyEvent(PyObject *self, PyObject *args, } -static PyObject * DynamicSashUnifyEvent_swigregister(PyObject *self, PyObject *args) { +static PyObject * DynamicSashUnifyEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; SWIG_TypeClientData(SWIGTYPE_p_wxDynamicSashUnifyEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_DynamicSashWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) -1 ; @@ -839,7 +964,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO wxDynamicSashWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = False ; + bool temp6 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -854,7 +979,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { @@ -870,14 +995,14 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO } } if (obj4) { - arg5 = (long) SWIG_AsLong(obj4); + arg5 = (long)SWIG_As_long(obj4); if (PyErr_Occurred()) SWIG_fail; } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = True; + temp6 = true; } } { @@ -903,7 +1028,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO } -static PyObject *_wrap_new_PreDynamicSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_PreDynamicSashWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDynamicSashWindow *result; char *kwnames[] = { @@ -926,7 +1051,7 @@ static PyObject *_wrap_new_PreDynamicSashWindow(PyObject *self, PyObject *args, } -static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DynamicSashWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDynamicSashWindow *arg1 = (wxDynamicSashWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -941,7 +1066,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = False ; + bool temp7 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -959,7 +1084,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); + arg3 = (int)SWIG_As_int(obj2); if (PyErr_Occurred()) SWIG_fail; } if (obj3) { @@ -975,14 +1100,14 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, } } if (obj5) { - arg6 = (long) SWIG_AsLong(obj5); + arg6 = (long)SWIG_As_long(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = True; + temp7 = true; } } { @@ -1009,7 +1134,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, } -static PyObject *_wrap_DynamicSashWindow_GetHScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DynamicSashWindow_GetHScrollBar(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDynamicSashWindow *arg1 = (wxDynamicSashWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -1039,7 +1164,7 @@ static PyObject *_wrap_DynamicSashWindow_GetHScrollBar(PyObject *self, PyObject } -static PyObject *_wrap_DynamicSashWindow_GetVScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DynamicSashWindow_GetVScrollBar(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDynamicSashWindow *arg1 = (wxDynamicSashWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -1069,14 +1194,14 @@ static PyObject *_wrap_DynamicSashWindow_GetVScrollBar(PyObject *self, PyObject } -static PyObject * DynamicSashWindow_swigregister(PyObject *self, PyObject *args) { +static PyObject * DynamicSashWindow_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; SWIG_TypeClientData(SWIGTYPE_p_wxDynamicSashWindow, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_EditableListBox(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 = (int) -1 ; @@ -1090,10 +1215,10 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj wxString const &arg7_defvalue = wxPyEditableListBoxNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxEditableListBox *result; - bool temp3 = False ; + bool temp3 = false ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = False ; + bool temp7 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -1109,14 +1234,14 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if (obj1) { - arg2 = (int) SWIG_AsInt(obj1); + arg2 = (int)SWIG_As_int(obj1); if (PyErr_Occurred()) SWIG_fail; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = True; + temp3 = true; } } if (obj3) { @@ -1132,14 +1257,14 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj } } if (obj5) { - arg6 = (long) SWIG_AsLong(obj5); + arg6 = (long)SWIG_As_long(obj5); if (PyErr_Occurred()) SWIG_fail; } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = True; + temp7 = true; } } { @@ -1173,11 +1298,11 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_EditableListBox_SetStrings(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEditableListBox *arg1 = (wxEditableListBox *) 0 ; wxArrayString *arg2 = 0 ; - bool temp2 = False ; + bool temp2 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1193,7 +1318,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args SWIG_fail; } arg2 = new wxArrayString; - temp2 = True; + temp2 = true; int i, len=PySequence_Length(obj1); for (i=0; i