X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..7eae615bad8c72486efd0ec84a2bad5c2d5af3af:/wxPython/src/msw/core_wrap.cpp diff --git a/wxPython/src/msw/core_wrap.cpp b/wxPython/src/msw/core_wrap.cpp index d44415c7bd..4d277a5bbd 100644 --- a/wxPython/src/msw/core_wrap.cpp +++ b/wxPython/src/msw/core_wrap.cpp @@ -45,6 +45,8 @@ private: #define SWIG_TypeName SWIG_Python_TypeName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData /*********************************************************************** @@ -59,36 +61,35 @@ private: #include -#if defined(_WIN32) || defined(__WIN32__) -# if defined(_MSC_VER) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif -# endif +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__GNUC__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) extern a +# else +# define SWIGEXPORT(a) __declspec(dllexport) a +# define SWIGIMPORT(a) extern a +# endif +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# define SWIGIMPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a +# endif +# endif #else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a #endif #ifdef SWIG_GLOBAL -#define SWIGRUNTIME(a) SWIGEXPORT(a) +# define SWIGRUNTIME(a) SWIGEXPORT(a) #else -#define SWIGRUNTIME(a) static a +# define SWIGRUNTIME(a) static a #endif - #ifdef __cplusplus extern "C" { #endif @@ -114,12 +115,16 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(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); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } + #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -130,7 +135,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -161,8 +165,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - - /* Common SWIG API */ #define SWIG_ConvertPtr(obj, pp, type, flags) \ SWIG_Python_ConvertPtr(obj, pp, type, flags) @@ -178,40 +180,26 @@ typedef struct swig_const_info { SWIG_Python_addvarlink(p, name, get_attr, set_attr) #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_PackData(c, ptr, sz) \ - SWIG_Python_PackData(c, ptr, sz) -#define SWIG_UnpackData(c, ptr, sz) \ - SWIG_Python_UnpackData(c, ptr, sz) #define SWIG_NewPackedObj(ptr, sz, type) \ SWIG_Python_NewPackedObj(ptr, sz, type) #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) -SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int); -SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } @@ -327,7 +315,7 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxPyApp swig_types[103] #define SWIGTYPE_p_wxCommandEvent swig_types[104] #define SWIGTYPE_p_wxPyCommandEvent swig_types[105] -#define SWIGTYPE_p_wxDropTarget swig_types[106] +#define SWIGTYPE_p_wxPyDropTarget swig_types[106] #define SWIGTYPE_p_wxChildFocusEvent swig_types[107] #define SWIGTYPE_p_wxFocusEvent swig_types[108] #define SWIGTYPE_p_wxDropFilesEvent swig_types[109] @@ -425,12 +413,12 @@ PyObject* wxPyConstructObject(void* ptr, // Extract a pointer to the wrapped C++ object from a Python proxy object. // Ensures that the proxy object is of the specified (or derived) type. If // not able to perform the conversion then a Python exception is set and the -// error should be handled properly in the caller. Returns true on success. +// error should be handled properly in the caller. Returns True on success. bool wxPyConvertSwigPtr(PyObject* obj, void **ptr, const wxChar* className) { swig_type_info* swigType = wxPyFindSwigType(className); - wxCHECK_MSG(swigType != NULL, false, wxT("Unknown type in wxPyConvertSwigPtr")); + wxCHECK_MSG(swigType != NULL, False, wxT("Unknown type in wxPyConvertSwigPtr")); return SWIG_Python_ConvertPtr(obj, ptr, swigType, SWIG_POINTER_EXCEPTION) != -1; } @@ -549,10 +537,6 @@ static wxPyCoreAPI API = { #endif - DECLARE_DEF_STRING(EmptyString); - DECLARE_DEF_STRING(PanelNameStr); - - #if ! wxUSE_HOTKEY enum wxHotkeyModifier { @@ -565,6 +549,7 @@ enum wxHotkeyModifier #define wxEVT_HOTKEY 9999 #endif + static const wxString wxPyEmptyString(wxEmptyString); wxString wxObject_GetClassName(wxObject *self){ return self->GetClassInfo()->GetClassName(); } @@ -576,7 +561,7 @@ void wxObject_Destroy(wxObject *self){ #define wxCURSOR_COPY_ARROW wxCURSOR_ARROW #endif -PyObject *wxSize_asTuple(wxSize *self){ +PyObject *wxSize_Get(wxSize *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); @@ -588,7 +573,7 @@ void wxRealPoint_Set(wxRealPoint *self,double x,double y){ self->x = x; self->y = y; } -PyObject *wxRealPoint_asTuple(wxRealPoint *self){ +PyObject *wxRealPoint_Get(wxRealPoint *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x)); @@ -600,7 +585,7 @@ void wxPoint_Set(wxPoint *self,long x,long y){ self->x = x; self->y = y; } -PyObject *wxPoint_asTuple(wxPoint *self){ +PyObject *wxPoint_Get(wxPoint *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); @@ -614,7 +599,7 @@ void wxRect_Set(wxRect *self,int x,int y,int width,int height){ self->width = width; self->height = height; } -PyObject *wxRect_asTuple(wxRect *self){ +PyObject *wxRect_Get(wxRect *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(4); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); @@ -637,7 +622,7 @@ PyObject *wxRect_asTuple(wxRect *self){ if (dest != wxRect(0,0,0,0)) { wxPyBeginBlockThreads(); wxRect* newRect = new wxRect(dest); - obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true); + obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True); wxPyEndBlockThreads(); return obj; } @@ -676,7 +661,7 @@ void wxPoint2D_Set(wxPoint2D *self,double x,double y){ self->m_x = x; self->m_y = y; } -PyObject *wxPoint2D_asTuple(wxPoint2D *self){ +PyObject *wxPoint2D_Get(wxPoint2D *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x)); @@ -795,7 +780,7 @@ wxImage *new_wxImage(int width,int height,unsigned char *data){ return NULL; } memcpy(copy, data, width*height*3); - return new wxImage(width, height, copy, FALSE); + return new wxImage(width, height, copy, False); } PyObject *wxImage_GetData(wxImage *self){ unsigned char* data = self->GetData(); @@ -935,11 +920,11 @@ void wxEvtHandler__setOORInfo(wxEvtHandler *self,PyObject *_self){ } } int wxKeyEvent_GetUniChar(wxKeyEvent *self){ - - - + #if wxUSE_UNICODE + return self->m_uniChar; + #else return 0; - + #endif } void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ self->m_size = size; @@ -958,11 +943,7 @@ PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){ } for (int i=0; iGetChildren(); return wxPy_ConvertList(&list); @@ -992,14 +974,14 @@ bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keyco - return FALSE; + return False; } bool wxWindow_UnregisterHotKey(wxWindow *self,int hotkeyId){ - return FALSE; + return False; } long wxWindow_GetHandle(wxWindow *self){ @@ -1028,7 +1010,7 @@ wxWindow* wxFindWindowByLabel( const wxString& label, win->SubclassWin(hWnd); return win; #else - PyErr_SetNone(PyExc_NotImplementedError); + wxPyRaiseNotImplemented(); return NULL; #endif } @@ -1045,9 +1027,7 @@ PyObject *wxMenu_GetMenuItems(wxMenu *self){ wxMenuItemList& list = self->GetMenuItems(); return wxPy_ConvertList(&list); } - - DECLARE_DEF_STRING(ControlNameStr); - + static const wxString wxPyControlNameStr(wxControlNameStr); int wxItemContainer_Append(wxItemContainer *self,wxString const &item,PyObject *clientData){ if (clientData) { wxPyClientData* data = new wxPyClientData(clientData); @@ -1093,8 +1073,8 @@ PyObject *wxSizerItem_GetUserData(wxSizerItem *self){ struct wxPySizerItemInfo { wxPySizerItemInfo() - : window(NULL), sizer(NULL), gotSize(false), - size(wxDefaultSize), gotPos(false), pos(-1) + : window(NULL), sizer(NULL), gotSize(False), + size(wxDefaultSize), gotPos(False), pos(-1) {} wxWindow* window; @@ -1125,13 +1105,13 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize, // try wxSize or (w,h) if ( checkSize && wxSize_helper(item, &sizePtr)) { info.size = *sizePtr; - info.gotSize = true; + info.gotSize = True; } // or a single int if (checkIdx && PyInt_Check(item)) { info.pos = PyInt_AsLong(item); - info.gotPos = true; + info.gotPos = True; } } } @@ -1159,7 +1139,7 @@ void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border wxPyUserData* data = NULL; wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); wxPyEndBlockThreads(); @@ -1177,7 +1157,7 @@ void wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion,int f wxPyUserData* data = NULL; wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); wxPyEndBlockThreads(); @@ -1195,7 +1175,7 @@ void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int bo wxPyUserData* data = NULL; wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); wxPyEndBlockThreads(); @@ -1211,7 +1191,7 @@ void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int bo } bool wxSizer_Remove(wxSizer *self,PyObject *item){ wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True); wxPyEndBlockThreads(); if ( info.window ) return self->Remove(info.window); @@ -1220,11 +1200,11 @@ bool wxSizer_Remove(wxSizer *self,PyObject *item){ else if ( info.gotPos ) return self->Remove(info.pos); else - return FALSE; + return False; } -void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize size){ +void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize const &size){ wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True); wxPyEndBlockThreads(); if ( info.window ) self->SetItemMinSize(info.window, size); @@ -1238,27 +1218,27 @@ PyObject *wxSizer_GetChildren(wxSizer *self){ return wxPy_ConvertList(&list); } void wxSizer_Show(wxSizer *self,PyObject *item,bool show){ - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); if ( info.window ) self->Show(info.window, show); else if ( info.sizer ) self->Show(info.sizer, show); } void wxSizer_Hide(wxSizer *self,PyObject *item){ - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); if ( info.window ) self->Hide(info.window); else if ( info.sizer ) self->Hide(info.sizer); } bool wxSizer_IsShown(wxSizer *self,PyObject *item){ - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False); if ( info.window ) return self->IsShown(info.window); else if ( info.sizer ) return self->IsShown(info.sizer); else - return false; + return False; } // See pyclasses.h @@ -1280,7 +1260,11 @@ bool wxGBSpan_helper(PyObject* source, wxGBSpan** obj) } -PyObject *wxGBPosition_asTuple(wxGBPosition *self){ +void wxGBPosition_Set(wxGBPosition *self,int row,int col){ + self->SetRow(row); + self->SetCol(col); + } +PyObject *wxGBPosition_Get(wxGBPosition *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); @@ -1288,7 +1272,11 @@ PyObject *wxGBPosition_asTuple(wxGBPosition *self){ wxPyEndBlockThreads(); return tup; } -PyObject *wxGBSpan_asTuple(wxGBSpan *self){ +void wxGBSpan_Set(wxGBSpan *self,int rowspan,int colspan){ + self->SetRowspan(rowspan); + self->SetColspan(colspan); + } +PyObject *wxGBSpan_Get(wxGBSpan *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan())); @@ -1300,7 +1288,7 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const & wxPyUserData* data = NULL; wxPyBeginBlockThreads(); - wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); wxPyEndBlockThreads(); @@ -1313,13 +1301,33 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const & else if (info.gotSize) return self->Add(info.size.GetWidth(), info.size.GetHeight(), pos, span, flag, border, data); - return false; + return False; } #ifdef __cplusplus extern "C" { #endif +static int _wrap_EmptyString_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only."); + return 1; +} + + +static PyObject *_wrap_EmptyString_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxObject *arg1 = (wxObject *) 0 ; @@ -1530,7 +1538,7 @@ static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwa } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSize const *)arg1)->operator ==((wxSize const &)*arg2); + result = (bool)(arg1)->operator ==((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -1562,7 +1570,7 @@ static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwa } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxSize const *)arg1)->operator !=((wxSize const &)*arg2); + result = (bool)(arg1)->operator !=((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -1715,7 +1723,7 @@ static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs int arg3 ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "xx",(char *) "yy", NULL + (char *) "self",(char *) "w",(char *) "h", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Size_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; @@ -1834,57 +1842,7 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_Size_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxSize *arg1 = (wxSize *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetX",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxSize const *)arg1)->GetX(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Size_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxSize *arg1 = (wxSize *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetY",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxSize const *)arg1)->GetY(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Size_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Size_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSize *arg1 = (wxSize *) 0 ; PyObject *result; @@ -1893,11 +1851,11 @@ static PyObject *_wrap_Size_asTuple(PyObject *self, PyObject *args, PyObject *kw (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxSize_asTuple(arg1); + result = (PyObject *)wxSize_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2044,11 +2002,11 @@ static PyObject *_wrap_delete_RealPoint(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - wxRealPoint result; + bool result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2056,7 +2014,7 @@ static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObjec (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___add__",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -2064,27 +2022,23 @@ static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxRealPoint const *)arg1)->operator +((wxRealPoint const &)*arg2); + result = (bool)(arg1)->operator ==((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - wxRealPoint * resultptr; - resultptr = new wxRealPoint((wxRealPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); - } + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - wxRealPoint result; + bool result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2092,7 +2046,7 @@ static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObjec (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___sub__",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -2100,27 +2054,23 @@ static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxRealPoint const *)arg1)->operator -((wxRealPoint const &)*arg2); + result = (bool)(arg1)->operator !=((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - wxRealPoint * resultptr; - resultptr = new wxRealPoint((wxRealPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); - } + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - bool result; + wxRealPoint result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2128,7 +2078,7 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___add__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -2136,23 +2086,27 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRealPoint const *)arg1)->operator ==((wxRealPoint const &)*arg2); + result = (arg1)->operator +((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + wxRealPoint * resultptr; + resultptr = new wxRealPoint((wxRealPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; wxRealPoint *arg2 = 0 ; - bool result; + wxRealPoint result; wxRealPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2160,7 +2114,7 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "pt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___sub__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -2168,12 +2122,16 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRealPoint const *)arg1)->operator !=((wxRealPoint const &)*arg2); + result = (arg1)->operator -((wxRealPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + wxRealPoint * resultptr; + resultptr = new wxRealPoint((wxRealPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1); + } return resultobj; fail: return NULL; @@ -2206,7 +2164,7 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_RealPoint_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_RealPoint_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRealPoint *arg1 = (wxRealPoint *) 0 ; PyObject *result; @@ -2215,11 +2173,11 @@ static PyObject *_wrap_RealPoint_asTuple(PyObject *self, PyObject *args, PyObjec (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxRealPoint_asTuple(arg1); + result = (PyObject *)wxRealPoint_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2375,7 +2333,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) goto fail; @@ -2386,7 +2344,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPoint const *)arg1)->operator ==((wxPoint const &)*arg2); + result = (bool)(arg1)->operator ==((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2407,7 +2365,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) goto fail; @@ -2418,7 +2376,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPoint const *)arg1)->operator !=((wxPoint const &)*arg2); + result = (bool)(arg1)->operator !=((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2439,7 +2397,7 @@ static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___add__",kwnames,&obj0,&obj1)) goto fail; @@ -2450,7 +2408,7 @@ static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *k } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPoint const *)arg1)->operator +((wxPoint const &)*arg2); + result = (arg1)->operator +((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2475,7 +2433,7 @@ static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___sub__",kwnames,&obj0,&obj1)) goto fail; @@ -2486,7 +2444,7 @@ static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *k } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPoint const *)arg1)->operator -((wxPoint const &)*arg2); + result = (arg1)->operator -((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2511,7 +2469,7 @@ static PyObject *_wrap_Point___iadd__(PyObject *self, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___iadd__",kwnames,&obj0,&obj1)) goto fail; @@ -2546,7 +2504,7 @@ static PyObject *_wrap_Point___isub__(PyObject *self, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "pt", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___isub__",kwnames,&obj0,&obj1)) goto fail; @@ -2598,7 +2556,7 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg } -static PyObject *_wrap_Point_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Point_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPoint *arg1 = (wxPoint *) 0 ; PyObject *result; @@ -2607,11 +2565,11 @@ static PyObject *_wrap_Point_asTuple(PyObject *self, PyObject *args, PyObject *k (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPoint_asTuple(arg1); + result = (PyObject *)wxPoint_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3072,6 +3030,126 @@ static PyObject *_wrap_Rect_SetSize(PyObject *self, PyObject *args, PyObject *kw } +static PyObject *_wrap_Rect_GetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetTopLeft",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxRect const *)arg1)->GetTopLeft(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_SetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "p", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTopLeft",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetTopLeft((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_GetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetBottomRight",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxRect const *)arg1)->GetBottomRight(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_SetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "p", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottomRight",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetBottomRight((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; @@ -3275,8 +3353,8 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; wxRect *result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -3305,8 +3383,8 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; wxRect *result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -3335,8 +3413,8 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dx",(char *) "dy", NULL @@ -3838,7 +3916,7 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs } -static PyObject *_wrap_Rect_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Rect_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; PyObject *result; @@ -3847,11 +3925,11 @@ static PyObject *_wrap_Rect_asTuple(PyObject *self, PyObject *args, PyObject *kw (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxRect_asTuple(arg1); + result = (PyObject *)wxRect_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4517,86 +4595,6 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_Point2D_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double arg2 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_x", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_m_x_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1) (arg1)->m_x = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Point2D_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_m_x_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (double) ((arg1)->m_x); - - resultobj = PyFloat_FromDouble(result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Point2D_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double arg2 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_y", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_m_y_set",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1) (arg1)->m_y = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Point2D_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPoint2D *arg1 = (wxPoint2D *) 0 ; - double result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_m_y_get",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (double) ((arg1)->m_y); - - resultobj = PyFloat_FromDouble(result); - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPoint2D *arg1 = (wxPoint2D *) 0 ; @@ -4703,7 +4701,7 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_Point2D_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Point2D_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPoint2D *arg1 = (wxPoint2D *) 0 ; PyObject *result; @@ -4712,11 +4710,11 @@ static PyObject *_wrap_Point2D_asTuple(PyObject *self, PyObject *args, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxPoint2D_asTuple(arg1); + result = (PyObject *)wxPoint2D_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5244,9 +5242,9 @@ static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwar wxFSFile *result; wxPyInputStream *temp1 ; bool created1 ; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; wxDateTime *argp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -5261,31 +5259,31 @@ static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwar { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if ((SWIG_ConvertPtr(obj4,(void **) &argp5, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; arg5 = *argp5; @@ -5385,7 +5383,7 @@ static PyObject *_wrap_FSFile_GetStream(PyObject *self, PyObject *args, PyObject if (result) { _ptr = new wxPyInputStream(result); } - resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true); + resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), True); } return resultobj; fail: @@ -5414,7 +5412,13 @@ static PyObject *_wrap_FSFile_GetMimeType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5442,7 +5446,13 @@ static PyObject *_wrap_FSFile_GetLocation(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5470,7 +5480,13 @@ static PyObject *_wrap_FSFile_GetAnchor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5577,7 +5593,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5589,7 +5605,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5619,7 +5635,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -5636,7 +5652,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5668,7 +5684,7 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5680,7 +5696,7 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5746,7 +5762,7 @@ static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *a wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5758,7 +5774,7 @@ static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5793,7 +5809,7 @@ static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObjec wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5805,7 +5821,7 @@ static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5840,7 +5856,7 @@ static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *arg wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5852,7 +5868,7 @@ static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5887,7 +5903,7 @@ static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObje wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5899,7 +5915,7 @@ static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5934,7 +5950,7 @@ static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyOb wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5946,7 +5962,7 @@ static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6035,8 +6051,8 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P PyObject *resultobj; wxFileSystem *arg1 = (wxFileSystem *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) FALSE ; - bool temp2 = false ; + bool arg3 = (bool) False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6049,7 +6065,7 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { arg3 = PyInt_AsLong(obj2) ? true : false; @@ -6113,7 +6129,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj wxFileSystem *arg1 = (wxFileSystem *) 0 ; wxString *arg2 = 0 ; wxFSFile *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6125,7 +6141,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6157,7 +6173,7 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6169,7 +6185,7 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6279,7 +6295,7 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename", NULL @@ -6289,7 +6305,7 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6330,7 +6346,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "url", NULL @@ -6340,7 +6356,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6397,7 +6413,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, wxInternetFSHandler *arg1 = (wxInternetFSHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6409,7 +6425,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6439,7 +6455,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6456,7 +6472,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6516,7 +6532,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6528,7 +6544,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6558,7 +6574,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6575,7 +6591,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6607,7 +6623,7 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6619,7 +6635,7 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6692,7 +6708,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj wxString *arg1 = 0 ; wxImage *arg2 = 0 ; long arg3 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6703,7 +6719,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -6736,7 +6752,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb wxString *arg1 = 0 ; wxBitmap *arg2 = 0 ; long arg3 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6747,7 +6763,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -6779,7 +6795,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject PyObject *resultobj; wxString *arg1 = 0 ; PyObject *arg2 = (PyObject *) 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6790,7 +6806,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } arg2 = obj1; { @@ -6840,7 +6856,7 @@ static PyObject *_wrap_new_MemoryFSHandler(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename", NULL @@ -6850,7 +6866,7 @@ static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6879,7 +6895,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6891,7 +6907,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6921,7 +6937,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args, wxFileSystem *arg2 = 0 ; wxString *arg3 = 0 ; wxFSFile *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6938,7 +6954,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args, { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6970,7 +6986,7 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args, wxString *arg2 = 0 ; int arg3 = (int) 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6982,7 +6998,7 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7173,7 +7189,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7185,7 +7201,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7213,7 +7229,7 @@ static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7225,7 +7241,7 @@ static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7253,7 +7269,7 @@ static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args, PyObject *resultobj; wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7265,7 +7281,7 @@ static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7318,7 +7334,7 @@ static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args, PyObject *resultobj; wxImageHandler *arg1 = (wxImageHandler *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7330,7 +7346,7 @@ static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7494,7 +7510,7 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg long arg2 = (long) wxBITMAP_TYPE_ANY ; int arg3 = (int) -1 ; wxImage *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type",(char *) "index", NULL @@ -7504,7 +7520,7 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7558,8 +7574,8 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec wxString *arg2 = 0 ; int arg3 = (int) -1 ; wxImage *result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7570,12 +7586,12 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7624,15 +7640,15 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } { @@ -7665,7 +7681,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P wxImage *result; wxPyInputStream *temp1 ; bool created1 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7676,21 +7692,21 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7726,7 +7742,7 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; int arg1 = (int) 0 ; int arg2 = (int) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; wxImage *result; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -8261,7 +8277,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxString *arg1 = 0 ; bool result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -8271,7 +8287,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8300,7 +8316,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj wxString *arg1 = 0 ; long arg2 = (long) wxBITMAP_TYPE_ANY ; int result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL @@ -8310,7 +8326,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8341,7 +8357,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * long arg3 = (long) wxBITMAP_TYPE_ANY ; int arg4 = (int) -1 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8353,7 +8369,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8384,8 +8400,8 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje wxString *arg3 = 0 ; int arg4 = (int) -1 ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8398,12 +8414,12 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8441,7 +8457,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * wxString *arg2 = 0 ; int arg3 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8453,7 +8469,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8483,8 +8499,8 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje wxString *arg2 = 0 ; wxString *arg3 = 0 ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8497,12 +8513,12 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8549,15 +8565,15 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj { if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) { arg1 = temp1->m_wxis; - created1 = false; + created1 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg1 = wxPyCBInputStream_create(obj0, false); + arg1 = wxPyCBInputStream_create(obj0, False); if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created1 = true; + created1 = True; } } { @@ -8602,15 +8618,15 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { arg2 = temp2->m_wxis; - created2 = false; + created2 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg2 = wxPyCBInputStream_create(obj1, false); + arg2 = wxPyCBInputStream_create(obj1, False); if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created2 = true; + created2 = True; } } { @@ -8644,7 +8660,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb bool result; wxPyInputStream *temp2 ; bool created2 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8657,21 +8673,21 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb { if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { arg2 = temp2->m_wxis; - created2 = false; + created2 = False; } else { PyErr_Clear(); // clear the failure of the wxPyConvert above - arg2 = wxPyCBInputStream_create(obj1, false); + arg2 = wxPyCBInputStream_create(obj1, False); if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object."); SWIG_fail; } - created2 = true; + created2 = True; } } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9197,7 +9213,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9254,7 +9270,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw wxImage *arg1 = (wxImage *) 0 ; double arg2 ; wxPoint *arg3 = 0 ; - bool arg4 = (bool) TRUE ; + bool arg4 = (bool) True ; wxPoint *arg5 = (wxPoint *) NULL ; SwigValueWrapper< wxImage > result; wxPoint temp3 ; @@ -9300,7 +9316,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9335,7 +9351,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; SwigValueWrapper< wxImage > result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9461,8 +9477,8 @@ static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; wxString *arg3 = 0 ; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9475,12 +9491,12 @@ static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9517,7 +9533,7 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; int arg3 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9529,7 +9545,7 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9558,7 +9574,7 @@ static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9570,7 +9586,7 @@ static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9605,7 +9621,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9617,7 +9633,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9646,7 +9662,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject wxImage *arg1 = (wxImage *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9658,7 +9674,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9796,7 +9812,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxString *arg1 = 0 ; bool result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -9806,7 +9822,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11029,7 +11045,7 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEvent *arg1 = (wxEvent *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11359,7 +11375,7 @@ static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, Py PyObject *resultobj; wxCommandEvent *arg1 = (wxCommandEvent *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11371,7 +11387,7 @@ static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12787,7 +12803,7 @@ static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *self, PyObject *a static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12797,7 +12813,7 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxMouseEvent const *)arg1)->GetX(); + result = (int)((wxMouseEvent const *)arg1)->GetX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12812,7 +12828,7 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12822,7 +12838,7 @@ static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxMouseEvent const *)arg1)->GetY(); + result = (int)((wxMouseEvent const *)arg1)->GetY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12937,7 +12953,7 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL @@ -12957,7 +12973,7 @@ static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12965,7 +12981,7 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_x_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_x); + result = (int) ((arg1)->m_x); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -12977,7 +12993,7 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL @@ -12997,7 +13013,7 @@ static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMouseEvent *arg1 = (wxMouseEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -13005,7 +13021,7 @@ static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_y_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_y); + result = (int) ((arg1)->m_y); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -13444,8 +13460,8 @@ static PyObject * MouseEvent_swigregister(PyObject *self, PyObject *args) { } static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxCoord arg1 = (wxCoord) 0 ; - wxCoord arg2 = (wxCoord) 0 ; + int arg1 = (int) 0 ; + int arg2 = (int) 0 ; wxSetCursorEvent *result; char *kwnames[] = { (char *) "x",(char *) "y", NULL @@ -13469,7 +13485,7 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -13479,7 +13495,7 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxSetCursorEvent const *)arg1)->GetX(); + result = (int)((wxSetCursorEvent const *)arg1)->GetX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13494,7 +13510,7 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -13504,7 +13520,7 @@ static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxSetCursorEvent const *)arg1)->GetY(); + result = (int)((wxSetCursorEvent const *)arg1)->GetY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13807,7 +13823,7 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -13817,7 +13833,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxUint32)((wxKeyEvent const *)arg1)->GetRawKeyCode(); + result = (unsigned int)((wxKeyEvent const *)arg1)->GetRawKeyCode(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13832,7 +13848,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -13842,7 +13858,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxUint32)((wxKeyEvent const *)arg1)->GetRawKeyFlags(); + result = (unsigned int)((wxKeyEvent const *)arg1)->GetRawKeyFlags(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13924,7 +13940,7 @@ static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *self, PyObject *args, static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -13934,7 +13950,7 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxKeyEvent const *)arg1)->GetX(); + result = (int)((wxKeyEvent const *)arg1)->GetX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13949,7 +13965,7 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -13959,7 +13975,7 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxKeyEvent const *)arg1)->GetY(); + result = (int)((wxKeyEvent const *)arg1)->GetY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13974,7 +13990,7 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_x", NULL @@ -13994,7 +14010,7 @@ static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -14002,7 +14018,7 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_x_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_x); + result = (int) ((arg1)->m_x); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -14014,7 +14030,7 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord arg2 ; + int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "m_y", NULL @@ -14034,7 +14050,7 @@ static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -14042,7 +14058,7 @@ static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_y_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxCoord) ((arg1)->m_y); + result = (int) ((arg1)->m_y); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -14309,7 +14325,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 arg2 ; + unsigned int arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14318,7 +14334,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxUint32) PyInt_AsLong(obj1); + arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_rawCode = arg2; @@ -14332,7 +14348,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -14340,7 +14356,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawCode_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxUint32) ((arg1)->m_rawCode); + result = (unsigned int) ((arg1)->m_rawCode); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -14352,7 +14368,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 arg2 ; + unsigned int arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14361,7 +14377,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxUint32) PyInt_AsLong(obj1); + arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; if (arg1) (arg1)->m_rawFlags = arg2; @@ -14375,7 +14391,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyEvent *arg1 = (wxKeyEvent *) 0 ; - wxUint32 result; + unsigned int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -14383,7 +14399,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawFlags_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (wxUint32) ((arg1)->m_rawFlags); + result = (unsigned int) ((arg1)->m_rawFlags); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -15150,7 +15166,7 @@ static PyObject * ChildFocusEvent_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; int arg3 = (int) 0 ; wxActivateEvent *result; PyObject * obj1 = 0 ; @@ -15432,7 +15448,7 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15547,7 +15563,7 @@ static PyObject * CloseEvent_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; wxShowEvent *result; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15636,7 +15652,7 @@ static PyObject * ShowEvent_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; wxIconizeEvent *result; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15812,7 +15828,7 @@ static PyObject * DropFilesEvent_swigregister(PyObject *self, PyObject *args) { } static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxUpdateUIEvent *result; char *kwnames[] = { (char *) "commandId", NULL @@ -16049,7 +16065,7 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -16061,7 +16077,7 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16257,7 +16273,7 @@ static PyObject * SysColourChangedEvent_swigregister(PyObject *self, PyObject *a } static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxMouseCaptureChangedEvent *result; PyObject * obj1 = 0 ; @@ -16348,7 +16364,7 @@ static PyObject * DisplayChangedEvent_swigregister(PyObject *self, PyObject *arg } static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxPaletteChangedEvent *result; char *kwnames[] = { (char *) "id", NULL @@ -16432,7 +16448,7 @@ static PyObject * PaletteChangedEvent_swigregister(PyObject *self, PyObject *arg } static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxQueryNewPaletteEvent *result; char *kwnames[] = { (char *) "winid", NULL @@ -16827,7 +16843,7 @@ static PyObject * WindowDestroyEvent_swigregister(PyObject *self, PyObject *args static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; - wxWindowID arg2 = (wxWindowID) 0 ; + int arg2 = (int) 0 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxContextMenuEvent *result; @@ -16949,7 +16965,7 @@ static PyObject *_wrap_new_IdleEvent(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxIdleEvent *arg1 = (wxIdleEvent *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17404,7 +17420,7 @@ static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17416,7 +17432,7 @@ static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17475,7 +17491,7 @@ static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17487,7 +17503,7 @@ static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17532,7 +17548,13 @@ static PyObject *_wrap_PyApp_GetVendorName(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -17543,7 +17565,7 @@ static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17555,7 +17577,7 @@ static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17631,7 +17653,7 @@ static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *self, PyObject *args static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; - bool arg2 = (bool) false ; + bool arg2 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -17865,36 +17887,6 @@ static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_PyApp_OnIdle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyApp *arg1 = (wxPyApp *) 0 ; - wxIdleEvent *arg2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "event", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_OnIdle",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIdleEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->OnIdle(*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; @@ -18130,50 +18122,50 @@ static PyObject *_wrap_PyApp_GetPrintMode(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; - int result; + int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetAssertMode",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetAssertMode",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetAssertMode(); + (arg1)->SetAssertMode(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyApp *arg1 = (wxPyApp *) 0 ; - int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "mode", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyApp_SetAssertMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_GetAssertMode",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyApp,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetAssertMode(arg2); + result = (int)(arg1)->GetAssertMode(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; @@ -18390,7 +18382,7 @@ static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "val", NULL @@ -18400,7 +18392,7 @@ static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *a { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18545,7 +18537,7 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) NULL ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -18671,10 +18663,396 @@ static PyObject *_wrap_GetApp(PyObject *self, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) 0 ; + int arg2 = (int) 0 ; + int arg3 = (int) 0 ; + wxMenuItem *arg4 = (wxMenuItem *) NULL ; + wxAcceleratorEntry *result; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiiO:new_AcceleratorEntry",kwnames,&arg1,&arg2,&arg3,&obj3)) goto fail; + if (obj3) { + if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxAcceleratorEntry *)new wxAcceleratorEntry(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_delete_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorEntry",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + wxMenuItem *arg5 = (wxMenuItem *) NULL ; + PyObject * obj0 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii|O:AcceleratorEntry_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj4) { + if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->Set(arg2,arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_SetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + wxMenuItem *arg2 = (wxMenuItem *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AcceleratorEntry_SetMenuItem",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMenuItem(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + wxMenuItem *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetMenuItem",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMenuItem *)((wxAcceleratorEntry const *)arg1)->GetMenuItem(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxObject(result); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetFlags",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetFlags(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetKeyCode",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetKeyCode(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetCommand",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetCommand(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject * AcceleratorEntry_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorEntry, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ; + wxAcceleratorTable *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "n", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_AcceleratorTable",kwnames,&obj0)) goto fail; + { + arg2 = wxAcceleratorEntry_LIST_helper(obj0); + if (arg2) arg1 = PyList_Size(obj0); + else arg1 = 0; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxAcceleratorTable *)new wxAcceleratorTable(arg1,(wxAcceleratorEntry const *)arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorTable, 1); + { + delete [] arg2; + } + return resultobj; + fail: + { + delete [] arg2; + } + return NULL; +} + + +static PyObject *_wrap_delete_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorTable",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorTable_Ok",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxAcceleratorTable const *)arg1)->Ok(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorTable, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static int _wrap_NullAcceleratorTable_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only."); + return 1; +} + + +static PyObject *_wrap_NullAcceleratorTable_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *) &wxNullAcceleratorTable, SWIGTYPE_p_wxAcceleratorTable, 0); + return pyobj; +} + + +static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxString *arg1 = 0 ; + wxAcceleratorEntry *result; + bool temp1 = False ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "label", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetAccelFromString",kwnames,&obj0)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxAcceleratorEntry *)wxGetAccelFromString((wxString const &)*arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 0); + { + if (temp1) + delete arg1; + } + return resultobj; + fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + +static int _wrap_PanelNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable PanelNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_PanelNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyPanelNameStr)->c_str(), (&wxPyPanelNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyPanelNameStr)->c_str(), (&wxPyPanelNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -18685,7 +19063,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar wxWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -18712,7 +19090,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -18767,7 +19145,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -18778,7 +19156,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; @@ -18807,7 +19185,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -18835,7 +19213,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -18942,7 +19320,7 @@ static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18954,7 +19332,7 @@ static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19013,7 +19391,7 @@ static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -19025,7 +19403,7 @@ static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19084,7 +19462,7 @@ static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -19096,7 +19474,7 @@ static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -19154,7 +19532,7 @@ static PyObject *_wrap_Window_GetName(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL @@ -19179,7 +19557,7 @@ static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -19189,7 +19567,7 @@ static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kw if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxWindowID)((wxWindow const *)arg1)->GetId(); + result = (int)((wxWindow const *)arg1)->GetId(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19595,7 +19973,7 @@ static PyObject *_wrap_Window_GetPosition(PyObject *self, PyObject *args, PyObje if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetPosition(); + result = (arg1)->GetPosition(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19629,7 +20007,7 @@ static PyObject *_wrap_Window_GetPositionTuple(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxWindow const *)arg1)->GetPosition(arg2,arg3); + (arg1)->GetPosition(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20432,7 +20810,7 @@ static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *self, PyObject *args, static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20488,7 +20866,7 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20795,7 +21173,7 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -21325,7 +21703,7 @@ static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, P wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; wxWindow *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -21337,7 +21715,7 @@ static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21447,7 +21825,7 @@ static PyObject *_wrap_Window_PushEventHandler(PyObject *self, PyObject *args, P static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; wxEvtHandler *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22013,7 +22391,7 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; wxRect *arg3 = (wxRect *) NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22700,7 +23078,7 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; int *arg3 = (int *) 0 ; int *arg4 = (int *) 0 ; - bool temp2 = false ; + bool temp2 = False ; int temp3 ; int temp4 ; PyObject * obj0 = 0 ; @@ -22716,7 +23094,7 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22757,7 +23135,7 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args, int *arg5 = (int *) 0 ; int *arg6 = (int *) 0 ; wxFont *arg7 = (wxFont *) NULL ; - bool temp2 = false ; + bool temp2 = False ; int temp3 ; int temp4 ; int temp5 ; @@ -22778,7 +23156,7 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg7, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -22992,8 +23370,8 @@ static PyObject *_wrap_Window_ScreenToClient(PyObject *self, PyObject *args, PyO static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -23277,7 +23655,7 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj int arg3 ; int arg4 ; int arg5 ; - bool arg6 = (bool) TRUE ; + bool arg6 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { @@ -23309,7 +23687,7 @@ static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObj wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; int arg3 ; - bool arg4 = (bool) TRUE ; + bool arg4 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { @@ -23601,7 +23979,7 @@ static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23613,7 +23991,7 @@ static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23641,7 +24019,7 @@ static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, P PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23653,7 +24031,7 @@ static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23712,7 +24090,7 @@ static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, P PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23724,7 +24102,7 @@ static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23805,7 +24183,7 @@ static PyObject *_wrap_Window_GetToolTip(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxDropTarget *arg2 = (wxDropTarget *) 0 ; + wxPyDropTarget *arg2 = (wxPyDropTarget *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23814,7 +24192,7 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDropTarget",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPyDropTarget,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDropTarget(arg2); @@ -23832,7 +24210,7 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_Window_GetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxDropTarget *result; + wxPyDropTarget *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -23842,12 +24220,12 @@ static PyObject *_wrap_Window_GetDropTarget(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDropTarget *)((wxWindow const *)arg1)->GetDropTarget(); + result = (wxPyDropTarget *)((wxWindow const *)arg1)->GetDropTarget(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxDropTarget, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPyDropTarget, 0); return resultobj; fail: return NULL; @@ -24016,7 +24394,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxSizer *arg2 = (wxSizer *) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -24049,7 +24427,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxSizer *arg2 = (wxSizer *) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -24201,7 +24579,7 @@ static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject wxString *arg1 = 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxWindow *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -24212,7 +24590,7 @@ static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -24246,7 +24624,7 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec wxString *arg1 = 0 ; wxWindow *arg2 = (wxWindow *) NULL ; wxWindow *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -24257,7 +24635,7 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -24521,7 +24899,7 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - int arg1 = (int) TRUE ; + int arg1 = (int) True ; char *kwnames[] = { (char *) "doIt", NULL }; @@ -24575,7 +24953,7 @@ static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *ar wxPyValidator *arg1 = (wxPyValidator *) 0 ; PyObject *arg2 = (PyObject *) 0 ; PyObject *arg3 = (PyObject *) 0 ; - int arg4 = (int) TRUE ; + int arg4 = (int) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -24628,7 +25006,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxString *arg1 = (wxString *) &arg1_defvalue ; long arg2 = (long) 0 ; wxMenu *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "title",(char *) "style", NULL @@ -24639,7 +25017,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -24674,13 +25052,13 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; int arg5 = (int) wxITEM_NORMAL ; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Append",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; @@ -24688,13 +25066,13 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -24758,13 +25136,13 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -24772,13 +25150,13 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -24818,13 +25196,13 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -24832,13 +25210,13 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -24879,14 +25257,14 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject wxMenu *arg4 = (wxMenu *) 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp3 = false ; - bool temp5 = false ; + bool temp3 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_AppendMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; @@ -24894,14 +25272,14 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -25026,14 +25404,14 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; int arg6 = (int) wxITEM_NORMAL ; - bool temp4 = false ; - bool temp5 = false ; + bool temp4 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|Oi:Menu_Insert",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; @@ -25043,13 +25421,13 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -25118,14 +25496,14 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb wxString *arg4 = 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp4 = false ; - bool temp5 = false ; + bool temp4 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; @@ -25135,13 +25513,13 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -25182,14 +25560,14 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb wxString *arg4 = 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp4 = false ; - bool temp5 = false ; + bool temp4 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; @@ -25199,13 +25577,13 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -25247,15 +25625,15 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject wxMenu *arg5 = (wxMenu *) 0 ; wxString const &arg6_defvalue = wxPyEmptyString ; wxString *arg6 = (wxString *) &arg6_defvalue ; - bool temp4 = false ; - bool temp6 = false ; + bool temp4 = False ; + bool temp6 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; @@ -25265,14 +25643,14 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -25340,13 +25718,13 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; int arg5 = (int) wxITEM_NORMAL ; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Prepend",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; @@ -25354,13 +25732,13 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -25424,13 +25802,13 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -25438,13 +25816,13 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -25484,13 +25862,13 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -25498,13 +25876,13 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -25545,14 +25923,14 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject wxMenu *arg4 = (wxMenu *) 0 ; wxString const &arg5_defvalue = wxPyEmptyString ; wxString *arg5 = (wxString *) &arg5_defvalue ; - bool temp3 = false ; - bool temp5 = false ; + bool temp3 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_PrependMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; @@ -25560,14 +25938,14 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -25607,7 +25985,7 @@ static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwa wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Remove",kwnames,&obj0,&arg2)) goto fail; @@ -25665,7 +26043,7 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Delete",kwnames,&obj0,&arg2)) goto fail; @@ -25743,7 +26121,7 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_DestroyId",kwnames,&obj0,&arg2)) goto fail; @@ -25845,7 +26223,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k wxMenu *arg1 = (wxMenu *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -25857,7 +26235,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25888,7 +26266,7 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObjec wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_FindItemById",kwnames,&obj0,&arg2)) goto fail; @@ -25948,7 +26326,7 @@ static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwa PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "enable", NULL + (char *) "self",(char *) "id",(char *) "enable", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -25976,7 +26354,7 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsEnabled",kwnames,&obj0,&arg2)) goto fail; @@ -26003,7 +26381,7 @@ static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwar PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "check", NULL + (char *) "self",(char *) "id",(char *) "check", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -26031,7 +26409,7 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsChecked",kwnames,&obj0,&arg2)) goto fail; @@ -26055,11 +26433,11 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k wxMenu *arg1 = (wxMenu *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "label", NULL + (char *) "self",(char *) "id",(char *) "label", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -26067,7 +26445,7 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26098,7 +26476,7 @@ static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *k wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetLabel",kwnames,&obj0,&arg2)) goto fail; @@ -26128,11 +26506,11 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje wxMenu *arg1 = (wxMenu *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "helpString", NULL + (char *) "self",(char *) "id",(char *) "helpString", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -26140,7 +26518,7 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26171,7 +26549,7 @@ static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObje wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetHelpString",kwnames,&obj0,&arg2)) goto fail; @@ -26200,7 +26578,7 @@ static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxMenu *arg1 = (wxMenu *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -26212,7 +26590,7 @@ static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *k { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26624,7 +27002,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * wxMenu *arg2 = (wxMenu *) 0 ; wxString *arg3 = 0 ; bool result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26638,7 +27016,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26669,7 +27047,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * wxMenu *arg3 = (wxMenu *) 0 ; wxString *arg4 = 0 ; bool result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26686,7 +27064,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26773,7 +27151,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject wxMenu *arg3 = (wxMenu *) 0 ; wxString *arg4 = 0 ; wxMenu *result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26790,7 +27168,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26913,7 +27291,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj wxMenuBar *arg1 = (wxMenuBar *) 0 ; size_t arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -26928,7 +27306,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26993,8 +27371,8 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; wxString *arg3 = 0 ; int result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -27007,12 +27385,12 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27051,7 +27429,7 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyOb wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_FindItemById",kwnames,&obj0,&arg2)) goto fail; @@ -27077,7 +27455,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject wxMenuBar *arg1 = (wxMenuBar *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -27089,7 +27467,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27121,7 +27499,7 @@ static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "enable", NULL + (char *) "self",(char *) "id",(char *) "enable", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27150,7 +27528,7 @@ static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "check", NULL + (char *) "self",(char *) "id",(char *) "check", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27178,7 +27556,7 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsChecked",kwnames,&obj0,&arg2)) goto fail; @@ -27204,7 +27582,7 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsEnabled",kwnames,&obj0,&arg2)) goto fail; @@ -27228,11 +27606,11 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject wxMenuBar *arg1 = (wxMenuBar *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "label", NULL + (char *) "self",(char *) "id",(char *) "label", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27240,7 +27618,7 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27271,7 +27649,7 @@ static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetLabel",kwnames,&obj0,&arg2)) goto fail; @@ -27301,11 +27679,11 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO wxMenuBar *arg1 = (wxMenuBar *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "helpString", NULL + (char *) "self",(char *) "id",(char *) "helpString", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27313,7 +27691,7 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27344,7 +27722,7 @@ static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyO wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetHelpString",kwnames,&obj0,&arg2)) goto fail; @@ -27490,8 +27868,8 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw int arg5 = (int) wxITEM_NORMAL ; wxMenu *arg6 = (wxMenu *) NULL ; wxMenuItem *result; - bool temp3 = false ; - bool temp4 = false ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -27508,14 +27886,14 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } if (obj5) { @@ -27613,7 +27991,7 @@ static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject * int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuItem_SetId",kwnames,&obj0,&arg2)) goto fail; @@ -27686,7 +28064,7 @@ static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -27698,7 +28076,7 @@ static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27774,7 +28152,13 @@ static PyObject *_wrap_MenuItem_GetText(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -27785,7 +28169,7 @@ static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args, PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "text", NULL @@ -27795,7 +28179,7 @@ static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27985,7 +28369,7 @@ static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28040,7 +28424,7 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28120,7 +28504,7 @@ static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28132,7 +28516,7 @@ static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -28177,7 +28561,13 @@ static PyObject *_wrap_MenuItem_GetHelp(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -28612,7 +29002,7 @@ static PyObject *_wrap_MenuItem_IsOwnerDrawn(PyObject *self, PyObject *args, PyO static PyObject *_wrap_MenuItem_SetOwnerDrawn(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMenuItem *arg1 = (wxMenuItem *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28728,10 +29118,30 @@ static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_ControlNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable ControlNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_ControlNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -28744,7 +29154,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxControl *result; wxPoint temp3 ; wxSize temp4 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -28778,7 +29188,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -28833,7 +29243,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxControl *arg1 = (wxControl *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -28846,7 +29256,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp8 = false ; + bool temp8 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; @@ -28882,7 +29292,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -28972,7 +29382,7 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxControl *arg1 = (wxControl *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -28984,7 +29394,7 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29021,7 +29431,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; PyObject *arg3 = (PyObject *) NULL ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -29034,7 +29444,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { arg3 = obj2; @@ -29119,7 +29529,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb int arg3 ; PyObject *arg4 = (PyObject *) NULL ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; @@ -29132,7 +29542,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj3) { arg4 = obj3; @@ -29322,7 +29732,7 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P wxItemContainer *arg1 = (wxItemContainer *) 0 ; int arg2 ; wxString *arg3 = 0 ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -29334,7 +29744,7 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29363,7 +29773,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, wxItemContainer *arg1 = (wxItemContainer *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -29375,7 +29785,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30633,8 +31043,8 @@ static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; - wxSize arg3 ; - wxSize *argp3 ; + wxSize *arg3 = 0 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -30645,11 +31055,13 @@ static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer__SetItemMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer__SetItemMinSize(arg1,arg2,arg3); + wxSizer__SetItemMinSize(arg1,arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30777,8 +31189,8 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; - wxSize arg2 ; - wxSize *argp2 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -30787,11 +31199,13 @@ static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetMinSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMinSize(arg2); + (arg1)->SetMinSize((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -31083,7 +31497,7 @@ static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *self, PyObject *args, static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -31163,7 +31577,7 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar PyObject *resultobj; wxSizer *arg1 = (wxSizer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -32166,6 +32580,78 @@ static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyOb } +static PyObject *_wrap_FlexGridSizer_GetRowHeights(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; + wxArrayInt *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetRowHeights",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxArrayInt const &_result_ref = ((wxFlexGridSizer const *)arg1)->GetRowHeights(); + result = (wxArrayInt *) &_result_ref; + } + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = PyList_New(0); + size_t idx; + for (idx = 0; idx < result->GetCount(); idx += 1) { + PyObject* val = PyInt_FromLong( result->Item(idx) ); + PyList_Append(resultobj, val); + Py_DECREF(val); + } + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_FlexGridSizer_GetColWidths(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ; + wxArrayInt *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetColWidths",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxArrayInt const &_result_ref = ((wxFlexGridSizer const *)arg1)->GetColWidths(); + result = (wxArrayInt *) &_result_ref; + } + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = PyList_New(0); + size_t idx; + for (idx = 0; idx < result->GetCount(); idx += 1) { + PyObject* val = PyInt_FromLong( result->Item(idx) ); + PyList_Append(resultobj, val); + Py_DECREF(val); + } + } + return resultobj; + fail: + return NULL; +} + + static PyObject * FlexGridSizer_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -32361,7 +32847,33 @@ static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_GBPosition_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGBPosition *arg1 = (wxGBPosition *) 0 ; + int arg2 = (int) 0 ; + int arg3 = (int) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "row",(char *) "col", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBPosition_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGBPosition_Set(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_GBPosition_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBPosition *arg1 = (wxGBPosition *) 0 ; PyObject *result; @@ -32370,11 +32882,11 @@ static PyObject *_wrap_GBPosition_asTuple(PyObject *self, PyObject *args, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxGBPosition_asTuple(arg1); + result = (PyObject *)wxGBPosition_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -32581,7 +33093,33 @@ static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_GBSpan_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGBSpan *arg1 = (wxGBSpan *) 0 ; + int arg2 = (int) 1 ; + int arg3 = (int) 1 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "rowspan",(char *) "colspan", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBSpan_Set",kwnames,&obj0,&arg2,&arg3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGBSpan_Set(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_GBSpan_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBSpan *arg1 = (wxGBSpan *) 0 ; PyObject *result; @@ -32590,11 +33128,11 @@ static PyObject *_wrap_GBSpan_asTuple(PyObject *self, PyObject *args, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxGBSpan_asTuple(arg1); + result = (PyObject *)wxGBSpan_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34188,6 +34726,38 @@ static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *self, PyObject } +static PyObject *_wrap_GridBagSizer_FindItemAtPoint(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ; + wxPoint *arg2 = 0 ; + wxGBSizerItem *result; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pt", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_FindItemAtPoint",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGBSizerItem *)(arg1)->FindItemAtPoint((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GridBagSizer_FindItemWithData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ; @@ -35394,6 +35964,7 @@ static PyObject * LayoutConstraints_swigregister(PyObject *self, PyObject *args) } static PyMethodDef SwigMethods[] = { { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS }, + { (char *)"_wxPyFixStockObjects", __wxPyFixStockObjects, METH_VARARGS }, { (char *)"Object_GetClassName", (PyCFunction) _wrap_Object_GetClassName, METH_VARARGS | METH_KEYWORDS }, { (char *)"Object_Destroy", (PyCFunction) _wrap_Object_Destroy, METH_VARARGS | METH_KEYWORDS }, { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS }, @@ -35414,9 +35985,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Size_GetX", (PyCFunction) _wrap_Size_GetX, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Size_GetY", (PyCFunction) _wrap_Size_GetY, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Size_asTuple", (PyCFunction) _wrap_Size_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS }, { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint_x_get", (PyCFunction) _wrap_RealPoint_x_get, METH_VARARGS | METH_KEYWORDS }, @@ -35424,12 +35993,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"RealPoint_y_get", (PyCFunction) _wrap_RealPoint_y_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_RealPoint", (PyCFunction) _wrap_new_RealPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_RealPoint", (PyCFunction) _wrap_delete_RealPoint, METH_VARARGS | METH_KEYWORDS }, - { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint___eq__", (PyCFunction) _wrap_RealPoint___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint___ne__", (PyCFunction) _wrap_RealPoint___ne__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint_Set", (PyCFunction) _wrap_RealPoint_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"RealPoint_asTuple", (PyCFunction) _wrap_RealPoint_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"RealPoint_Get", (PyCFunction) _wrap_RealPoint_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"RealPoint_swigregister", RealPoint_swigregister, METH_VARARGS }, { (char *)"Point_x_set", (PyCFunction) _wrap_Point_x_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point_x_get", (PyCFunction) _wrap_Point_x_get, METH_VARARGS | METH_KEYWORDS }, @@ -35444,7 +36013,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Point___iadd__", (PyCFunction) _wrap_Point___iadd__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point___isub__", (PyCFunction) _wrap_Point___isub__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point_Set", (PyCFunction) _wrap_Point_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point_asTuple", (PyCFunction) _wrap_Point_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Point_Get", (PyCFunction) _wrap_Point_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point_swigregister", Point_swigregister, METH_VARARGS }, { (char *)"new_Rect", (PyCFunction) _wrap_new_Rect, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_RectPP", (PyCFunction) _wrap_new_RectPP, METH_VARARGS | METH_KEYWORDS }, @@ -35462,6 +36031,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect_SetPosition", (PyCFunction) _wrap_Rect_SetPosition, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetSize", (PyCFunction) _wrap_Rect_GetSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_SetSize", (PyCFunction) _wrap_Rect_SetSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_GetTopLeft", (PyCFunction) _wrap_Rect_GetTopLeft, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_SetTopLeft", (PyCFunction) _wrap_Rect_SetTopLeft, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_GetBottomRight", (PyCFunction) _wrap_Rect_GetBottomRight, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_SetBottomRight", (PyCFunction) _wrap_Rect_SetBottomRight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetLeft", (PyCFunction) _wrap_Rect_GetLeft, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetTop", (PyCFunction) _wrap_Rect_GetTop, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetBottom", (PyCFunction) _wrap_Rect_GetBottom, METH_VARARGS | METH_KEYWORDS }, @@ -35491,7 +36064,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect_height_set", (PyCFunction) _wrap_Rect_height_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_height_get", (PyCFunction) _wrap_Rect_height_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_Set", (PyCFunction) _wrap_Rect_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Rect_asTuple", (PyCFunction) _wrap_Rect_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_Get", (PyCFunction) _wrap_Rect_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_swigregister", Rect_swigregister, METH_VARARGS }, { (char *)"IntersectRect", (PyCFunction) _wrap_IntersectRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_Point2D", (PyCFunction) _wrap_new_Point2D, METH_VARARGS | METH_KEYWORDS }, @@ -35514,16 +36087,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"Point2D___idiv__", (PyCFunction) _wrap_Point2D___idiv__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D___eq__", (PyCFunction) _wrap_Point2D___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D___ne__", (PyCFunction) _wrap_Point2D___ne__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_x_set", (PyCFunction) _wrap_Point2D_m_x_set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_x_get", (PyCFunction) _wrap_Point2D_m_x_get, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_y_set", (PyCFunction) _wrap_Point2D_m_y_set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_m_y_get", (PyCFunction) _wrap_Point2D_m_y_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_x_set", (PyCFunction) _wrap_Point2D_x_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_x_get", (PyCFunction) _wrap_Point2D_x_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_y_set", (PyCFunction) _wrap_Point2D_y_set, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_y_get", (PyCFunction) _wrap_Point2D_y_get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_Set", (PyCFunction) _wrap_Point2D_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Point2D_asTuple", (PyCFunction) _wrap_Point2D_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS }, { (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS }, { (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS }, @@ -36028,7 +36597,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyApp_Dispatch", (PyCFunction) _wrap_PyApp_Dispatch, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_ProcessIdle", (PyCFunction) _wrap_PyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SendIdleEvents", (PyCFunction) _wrap_PyApp_SendIdleEvents, METH_VARARGS | METH_KEYWORDS }, - { (char *)"PyApp_OnIdle", (PyCFunction) _wrap_PyApp_OnIdle, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_IsActive", (PyCFunction) _wrap_PyApp_IsActive, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SetTopWindow", (PyCFunction) _wrap_PyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetTopWindow", (PyCFunction) _wrap_PyApp_GetTopWindow, METH_VARARGS | METH_KEYWORDS }, @@ -36038,8 +36606,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyApp_GetUseBestVisual", (PyCFunction) _wrap_PyApp_GetUseBestVisual, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SetPrintMode", (PyCFunction) _wrap_PyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetPrintMode", (PyCFunction) _wrap_PyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS }, - { (char *)"PyApp_GetAssertMode", (PyCFunction) _wrap_PyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_SetAssertMode", (PyCFunction) _wrap_PyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PyApp_GetAssertMode", (PyCFunction) _wrap_PyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS }, { (char *)"PyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS }, @@ -36061,6 +36629,20 @@ static PyMethodDef SwigMethods[] = { { (char *)"PostEvent", (PyCFunction) _wrap_PostEvent, METH_VARARGS | METH_KEYWORDS }, { (char *)"App_CleanUp", (PyCFunction) _wrap_App_CleanUp, METH_VARARGS | METH_KEYWORDS }, { (char *)"GetApp", (PyCFunction) _wrap_GetApp, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, + { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_SetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_SetMenuItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_GetMenuItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS }, + { (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS }, + { (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS }, + { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS }, + { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS }, @@ -36516,6 +37098,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"FlexGridSizer_GetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_GetFlexibleDirection, METH_VARARGS | METH_KEYWORDS }, { (char *)"FlexGridSizer_SetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_SetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"FlexGridSizer_GetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_GetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"FlexGridSizer_GetRowHeights", (PyCFunction) _wrap_FlexGridSizer_GetRowHeights, METH_VARARGS | METH_KEYWORDS }, + { (char *)"FlexGridSizer_GetColWidths", (PyCFunction) _wrap_FlexGridSizer_GetColWidths, METH_VARARGS | METH_KEYWORDS }, { (char *)"FlexGridSizer_swigregister", FlexGridSizer_swigregister, METH_VARARGS }, { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS }, @@ -36524,7 +37108,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBPosition_SetCol", (PyCFunction) _wrap_GBPosition_SetCol, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition___eq__", (PyCFunction) _wrap_GBPosition___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition___ne__", (PyCFunction) _wrap_GBPosition___ne__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GBPosition_asTuple", (PyCFunction) _wrap_GBPosition_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBPosition_Set", (PyCFunction) _wrap_GBPosition_Set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS }, { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS }, @@ -36533,7 +37118,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBSpan_SetColspan", (PyCFunction) _wrap_GBSpan_SetColspan, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan___eq__", (PyCFunction) _wrap_GBSpan___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan___ne__", (PyCFunction) _wrap_GBSpan___ne__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GBSpan_asTuple", (PyCFunction) _wrap_GBSpan_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBSpan_Set", (PyCFunction) _wrap_GBSpan_Set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS }, { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS }, @@ -36559,6 +37145,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridBagSizer_SetItemSpan", _wrap_GridBagSizer_SetItemSpan, METH_VARARGS }, { (char *)"GridBagSizer_FindItem", _wrap_GridBagSizer_FindItem, METH_VARARGS }, { (char *)"GridBagSizer_FindItemAtPosition", (PyCFunction) _wrap_GridBagSizer_FindItemAtPosition, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GridBagSizer_FindItemAtPoint", (PyCFunction) _wrap_GridBagSizer_FindItemAtPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridBagSizer_FindItemWithData", (PyCFunction) _wrap_GridBagSizer_FindItemWithData, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridBagSizer_RecalcSizes", (PyCFunction) _wrap_GridBagSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridBagSizer_CalcMin", (PyCFunction) _wrap_GridBagSizer_CalcMin, METH_VARARGS | METH_KEYWORDS }, @@ -36903,6 +37490,9 @@ static void *_p_wxWindowTo_p_wxObject(void *x) { static void *_p_wxControlTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxControl *) x)); } +static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) { + return (void *)((wxObject *) ((wxAcceleratorTable *) x)); +} static void *_p_wxGridSizerTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizer *) ((wxGridSizer *) x)); } @@ -37176,7 +37766,7 @@ static swig_type_info _swigt__p_wxImageHistogram[] = {{"_p_wxImageHistogram", 0, static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}}; static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxPyInputStream[] = {{"_p_wxPyInputStream", 0, "wxPyInputStream *", 0},{"_p_wxPyInputStream"},{0}}; static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0},{"_p_wxOutputStream"},{0}}; static swig_type_info _swigt__p_wxInputStream[] = {{"_p_wxInputStream", 0, "wxInputStream *", 0},{"_p_wxInputStream"},{0}}; @@ -37198,7 +37788,7 @@ static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMous static swig_type_info _swigt__p_wxPyApp[] = {{"_p_wxPyApp", 0, "wxPyApp *", 0},{"_p_wxPyApp"},{0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{0}}; static swig_type_info _swigt__p_wxPyCommandEvent[] = {{"_p_wxPyCommandEvent", 0, "wxPyCommandEvent *", 0},{"_p_wxPyCommandEvent"},{0}}; -static swig_type_info _swigt__p_wxDropTarget[] = {{"_p_wxDropTarget", 0, "wxDropTarget *", 0},{"_p_wxDropTarget"},{0}}; +static swig_type_info _swigt__p_wxPyDropTarget[] = {{"_p_wxPyDropTarget", 0, "wxPyDropTarget *", 0},{"_p_wxPyDropTarget"},{0}}; static swig_type_info _swigt__p_wxChildFocusEvent[] = {{"_p_wxChildFocusEvent", 0, "wxChildFocusEvent *", 0},{"_p_wxChildFocusEvent"},{0}}; static swig_type_info _swigt__p_wxFocusEvent[] = {{"_p_wxFocusEvent", 0, "wxFocusEvent *", 0},{"_p_wxFocusEvent"},{0}}; static swig_type_info _swigt__p_wxDropFilesEvent[] = {{"_p_wxDropFilesEvent", 0, "wxDropFilesEvent *", 0},{"_p_wxDropFilesEvent"},{0}}; @@ -37314,7 +37904,7 @@ _swigt__p_wxMouseEvent, _swigt__p_wxPyApp, _swigt__p_wxCommandEvent, _swigt__p_wxPyCommandEvent, -_swigt__p_wxDropTarget, +_swigt__p_wxPyDropTarget, _swigt__p_wxChildFocusEvent, _swigt__p_wxFocusEvent, _swigt__p_wxDropFilesEvent, @@ -37550,6 +38140,7 @@ static swig_const_info swig_const_table[] = { { SWIG_PY_INT, (char *)"MENU_TEAROFF", (long) wxMENU_TEAROFF, 0, 0, 0}, { SWIG_PY_INT, (char *)"MB_DOCKABLE", (long) wxMB_DOCKABLE, 0, 0, 0}, { SWIG_PY_INT, (char *)"NO_FULL_REPAINT_ON_RESIZE", (long) wxNO_FULL_REPAINT_ON_RESIZE, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"FULL_REPAINT_ON_RESIZE", (long) wxFULL_REPAINT_ON_RESIZE, 0, 0, 0}, { SWIG_PY_INT, (char *)"LI_HORIZONTAL", (long) wxLI_HORIZONTAL, 0, 0, 0}, { SWIG_PY_INT, (char *)"LI_VERTICAL", (long) wxLI_VERTICAL, 0, 0, 0}, { SWIG_PY_INT, (char *)"WS_EX_VALIDATE_RECURSIVELY", (long) wxWS_EX_VALIDATE_RECURSIVELY, 0, 0, 0}, @@ -37868,36 +38459,23 @@ static swig_const_info swig_const_table[] = { { SWIG_PY_INT, (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP_RESOURCE", (long) wxBITMAP_TYPE_BMP_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_RESOURCE", (long) wxBITMAP_TYPE_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO_RESOURCE", (long) wxBITMAP_TYPE_ICO_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR_RESOURCE", (long) wxBITMAP_TYPE_CUR_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF_RESOURCE", (long) wxBITMAP_TYPE_TIF_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF_RESOURCE", (long) wxBITMAP_TYPE_GIF_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG_RESOURCE", (long) wxBITMAP_TYPE_PNG_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG_RESOURCE", (long) wxBITMAP_TYPE_JPEG_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM_RESOURCE", (long) wxBITMAP_TYPE_PNM_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX_RESOURCE", (long) wxBITMAP_TYPE_PCX_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT_RESOURCE", (long) wxBITMAP_TYPE_PICT_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON_RESOURCE", (long) wxBITMAP_TYPE_ICON_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR_RESOURCE", (long) wxBITMAP_TYPE_MACCURSOR_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0}, { SWIG_PY_INT, (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0}, { SWIG_PY_INT, (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0}, @@ -38133,6 +38711,7 @@ SWIGEXPORT(void) SWIG_init(void) { #endif PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); + SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set); @@ -38261,7 +38840,10 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong(wxEVT_COMMAND_SET_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS)); PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER)); + SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); + SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set); + SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set); // Initialize threading, some globals and such