From: Robin Dunn Date: Fri, 25 Jul 2003 02:32:46 +0000 (+0000) Subject: build fixes and reSWIGs for wxMSW X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5a2a9da2c234078f32cf6827bbca0d31abd8a85c?ds=sidebyside;hp=d84a9306f0c1a8d535053ef03d9d416660d3251a build fixes and reSWIGs for wxMSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/contrib/stc/msw/stc_.cpp b/wxPython/contrib/stc/msw/stc_.cpp index ac7fbdb933..a4013ec1d0 100644 --- a/wxPython/contrib/stc/msw/stc_.cpp +++ b/wxPython/contrib/stc/msw/stc_.cpp @@ -7933,6 +7933,34 @@ static PyObject *_wrap_wxStyledTextCtrl_LineEndDisplayExtend(PyObject *self, PyO return _resultobj; } +#define wxStyledTextCtrl_LineCopy(_swigobj) (_swigobj->LineCopy()) +static PyObject *_wrap_wxStyledTextCtrl_LineCopy(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_LineCopy",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_LineCopy. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxStyledTextCtrl_LineCopy(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxStyledTextCtrl_MoveCaretInsideView(_swigobj) (_swigobj->MoveCaretInsideView()) static PyObject *_wrap_wxStyledTextCtrl_MoveCaretInsideView(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -9605,6 +9633,134 @@ static PyObject *_wrap_wxStyledTextCtrl_SetHotspotActiveUnderline(PyObject *self return _resultobj; } +#define wxStyledTextCtrl_PositionBefore(_swigobj,_swigarg0) (_swigobj->PositionBefore(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_PositionBefore(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxStyledTextCtrl * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pos", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionBefore",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_PositionBefore. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxStyledTextCtrl_PositionBefore(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxStyledTextCtrl_PositionAfter(_swigobj,_swigarg0) (_swigobj->PositionAfter(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_PositionAfter(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxStyledTextCtrl * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pos", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionAfter",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_PositionAfter. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxStyledTextCtrl_PositionAfter(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxStyledTextCtrl_CopyRange(_swigobj,_swigarg0,_swigarg1) (_swigobj->CopyRange(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxStyledTextCtrl_CopyRange(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","start","end", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxStyledTextCtrl_CopyRange",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_CopyRange. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxStyledTextCtrl_CopyRange(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextCtrl_CopyText(_swigobj,_swigarg0,_swigarg1) (_swigobj->CopyText(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxStyledTextCtrl_CopyText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextCtrl * _arg0; + int _arg1; + wxString * _arg2; + PyObject * _argo0 = 0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","length","text", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxStyledTextCtrl_CopyText",_kwnames,&_argo0,&_arg1,&_obj2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_CopyText. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxStyledTextCtrl_CopyText(_arg0,_arg1,*_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + #define wxStyledTextCtrl_StartRecord(_swigobj) (_swigobj->StartRecord()) static PyObject *_wrap_wxStyledTextCtrl_StartRecord(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -11921,6 +12077,10 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextCtrl_SetLexer", (PyCFunction) _wrap_wxStyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_StopRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_StartRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_CopyText", (PyCFunction) _wrap_wxStyledTextCtrl_CopyText, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_CopyRange", (PyCFunction) _wrap_wxStyledTextCtrl_CopyRange, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_PositionAfter", (PyCFunction) _wrap_wxStyledTextCtrl_PositionAfter, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_PositionBefore", (PyCFunction) _wrap_wxStyledTextCtrl_PositionBefore, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetHotspotActiveUnderline", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveUnderline, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetHotspotActiveBackground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveBackground, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetHotspotActiveForeground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveForeground, METH_VARARGS | METH_KEYWORDS }, @@ -11976,6 +12136,7 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextCtrl_BraceHighlight", (PyCFunction) _wrap_wxStyledTextCtrl_BraceHighlight, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_LineLength", (PyCFunction) _wrap_wxStyledTextCtrl_LineLength, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_MoveCaretInsideView", (PyCFunction) _wrap_wxStyledTextCtrl_MoveCaretInsideView, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_LineCopy", (PyCFunction) _wrap_wxStyledTextCtrl_LineCopy, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_LineEndDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplayExtend, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_LineEndDisplay", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplay, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_HomeDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_HomeDisplayExtend, METH_VARARGS | METH_KEYWORDS }, @@ -12559,6 +12720,8 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_LEX_F77", PyInt_FromLong((long) 37)); PyDict_SetItemString(d,"wxSTC_LEX_CSS", PyInt_FromLong((long) 38)); PyDict_SetItemString(d,"wxSTC_LEX_POV", PyInt_FromLong((long) 39)); + PyDict_SetItemString(d,"wxSTC_LEX_LOUT", PyInt_FromLong((long) 40)); + PyDict_SetItemString(d,"wxSTC_LEX_ESCRIPT", PyInt_FromLong((long) 41)); PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000)); PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1)); @@ -12593,6 +12756,7 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_C_WORD2", PyInt_FromLong((long) 16)); PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORD", PyInt_FromLong((long) 17)); PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORDERROR", PyInt_FromLong((long) 18)); + PyDict_SetItemString(d,"wxSTC_C_GLOBALCLASS", PyInt_FromLong((long) 19)); PyDict_SetItemString(d,"wxSTC_H_DEFAULT", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"wxSTC_H_TAG", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxSTC_H_TAGUNKNOWN", PyInt_FromLong((long) 2)); @@ -12965,6 +13129,29 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 8)); PyDict_SetItemString(d,"wxSTC_POV_BRACE", PyInt_FromLong((long) 9)); PyDict_SetItemString(d,"wxSTC_POV_WORD2", PyInt_FromLong((long) 10)); + PyDict_SetItemString(d,"wxSTC_LOUT_DEFAULT", PyInt_FromLong((long) 0)); + PyDict_SetItemString(d,"wxSTC_LOUT_COMMENT", PyInt_FromLong((long) 1)); + PyDict_SetItemString(d,"wxSTC_LOUT_NUMBER", PyInt_FromLong((long) 2)); + PyDict_SetItemString(d,"wxSTC_LOUT_WORD", PyInt_FromLong((long) 3)); + PyDict_SetItemString(d,"wxSTC_LOUT_WORD2", PyInt_FromLong((long) 4)); + PyDict_SetItemString(d,"wxSTC_LOUT_WORD3", PyInt_FromLong((long) 5)); + PyDict_SetItemString(d,"wxSTC_LOUT_WORD4", PyInt_FromLong((long) 6)); + PyDict_SetItemString(d,"wxSTC_LOUT_STRING", PyInt_FromLong((long) 7)); + PyDict_SetItemString(d,"wxSTC_LOUT_OPERATOR", PyInt_FromLong((long) 8)); + PyDict_SetItemString(d,"wxSTC_LOUT_IDENTIFIER", PyInt_FromLong((long) 9)); + PyDict_SetItemString(d,"wxSTC_LOUT_STRINGEOL", PyInt_FromLong((long) 10)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_DEFAULT", PyInt_FromLong((long) 0)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENT", PyInt_FromLong((long) 1)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTLINE", PyInt_FromLong((long) 2)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTDOC", PyInt_FromLong((long) 3)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_NUMBER", PyInt_FromLong((long) 4)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD", PyInt_FromLong((long) 5)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_STRING", PyInt_FromLong((long) 6)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_OPERATOR", PyInt_FromLong((long) 7)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_IDENTIFIER", PyInt_FromLong((long) 8)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_BRACE", PyInt_FromLong((long) 9)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD2", PyInt_FromLong((long) 10)); + PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD3", PyInt_FromLong((long) 11)); PyDict_SetItemString(d,"wxSTC_CMD_REDO", PyInt_FromLong((long) 2011)); PyDict_SetItemString(d,"wxSTC_CMD_SELECTALL", PyInt_FromLong((long) 2013)); PyDict_SetItemString(d,"wxSTC_CMD_UNDO", PyInt_FromLong((long) 2176)); diff --git a/wxPython/contrib/stc/msw/stc_.py b/wxPython/contrib/stc/msw/stc_.py index 93e7f892ef..2a0d4627c4 100644 --- a/wxPython/contrib/stc/msw/stc_.py +++ b/wxPython/contrib/stc/msw/stc_.py @@ -878,6 +878,9 @@ class wxStyledTextCtrlPtr(wxControlPtr): def LineEndDisplayExtend(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_LineEndDisplayExtend(self, *_args, **_kwargs) return val + def LineCopy(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_LineCopy(self, *_args, **_kwargs) + return val def MoveCaretInsideView(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_MoveCaretInsideView(self, *_args, **_kwargs) return val @@ -1044,6 +1047,18 @@ class wxStyledTextCtrlPtr(wxControlPtr): def SetHotspotActiveUnderline(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_SetHotspotActiveUnderline(self, *_args, **_kwargs) return val + def PositionBefore(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_PositionBefore(self, *_args, **_kwargs) + return val + def PositionAfter(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_PositionAfter(self, *_args, **_kwargs) + return val + def CopyRange(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_CopyRange(self, *_args, **_kwargs) + return val + def CopyText(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_CopyText(self, *_args, **_kwargs) + return val def StartRecord(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_StartRecord(self, *_args, **_kwargs) return val @@ -1497,6 +1512,8 @@ wxSTC_LEX_FORTRAN = stc_c.wxSTC_LEX_FORTRAN wxSTC_LEX_F77 = stc_c.wxSTC_LEX_F77 wxSTC_LEX_CSS = stc_c.wxSTC_LEX_CSS wxSTC_LEX_POV = stc_c.wxSTC_LEX_POV +wxSTC_LEX_LOUT = stc_c.wxSTC_LEX_LOUT +wxSTC_LEX_ESCRIPT = stc_c.wxSTC_LEX_ESCRIPT wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE @@ -1531,6 +1548,7 @@ wxSTC_C_COMMENTLINEDOC = stc_c.wxSTC_C_COMMENTLINEDOC wxSTC_C_WORD2 = stc_c.wxSTC_C_WORD2 wxSTC_C_COMMENTDOCKEYWORD = stc_c.wxSTC_C_COMMENTDOCKEYWORD wxSTC_C_COMMENTDOCKEYWORDERROR = stc_c.wxSTC_C_COMMENTDOCKEYWORDERROR +wxSTC_C_GLOBALCLASS = stc_c.wxSTC_C_GLOBALCLASS wxSTC_H_DEFAULT = stc_c.wxSTC_H_DEFAULT wxSTC_H_TAG = stc_c.wxSTC_H_TAG wxSTC_H_TAGUNKNOWN = stc_c.wxSTC_H_TAGUNKNOWN @@ -1903,6 +1921,29 @@ wxSTC_POV_OPERATOR = stc_c.wxSTC_POV_OPERATOR wxSTC_POV_IDENTIFIER = stc_c.wxSTC_POV_IDENTIFIER wxSTC_POV_BRACE = stc_c.wxSTC_POV_BRACE wxSTC_POV_WORD2 = stc_c.wxSTC_POV_WORD2 +wxSTC_LOUT_DEFAULT = stc_c.wxSTC_LOUT_DEFAULT +wxSTC_LOUT_COMMENT = stc_c.wxSTC_LOUT_COMMENT +wxSTC_LOUT_NUMBER = stc_c.wxSTC_LOUT_NUMBER +wxSTC_LOUT_WORD = stc_c.wxSTC_LOUT_WORD +wxSTC_LOUT_WORD2 = stc_c.wxSTC_LOUT_WORD2 +wxSTC_LOUT_WORD3 = stc_c.wxSTC_LOUT_WORD3 +wxSTC_LOUT_WORD4 = stc_c.wxSTC_LOUT_WORD4 +wxSTC_LOUT_STRING = stc_c.wxSTC_LOUT_STRING +wxSTC_LOUT_OPERATOR = stc_c.wxSTC_LOUT_OPERATOR +wxSTC_LOUT_IDENTIFIER = stc_c.wxSTC_LOUT_IDENTIFIER +wxSTC_LOUT_STRINGEOL = stc_c.wxSTC_LOUT_STRINGEOL +wxSTC_ESCRIPT_DEFAULT = stc_c.wxSTC_ESCRIPT_DEFAULT +wxSTC_ESCRIPT_COMMENT = stc_c.wxSTC_ESCRIPT_COMMENT +wxSTC_ESCRIPT_COMMENTLINE = stc_c.wxSTC_ESCRIPT_COMMENTLINE +wxSTC_ESCRIPT_COMMENTDOC = stc_c.wxSTC_ESCRIPT_COMMENTDOC +wxSTC_ESCRIPT_NUMBER = stc_c.wxSTC_ESCRIPT_NUMBER +wxSTC_ESCRIPT_WORD = stc_c.wxSTC_ESCRIPT_WORD +wxSTC_ESCRIPT_STRING = stc_c.wxSTC_ESCRIPT_STRING +wxSTC_ESCRIPT_OPERATOR = stc_c.wxSTC_ESCRIPT_OPERATOR +wxSTC_ESCRIPT_IDENTIFIER = stc_c.wxSTC_ESCRIPT_IDENTIFIER +wxSTC_ESCRIPT_BRACE = stc_c.wxSTC_ESCRIPT_BRACE +wxSTC_ESCRIPT_WORD2 = stc_c.wxSTC_ESCRIPT_WORD2 +wxSTC_ESCRIPT_WORD3 = stc_c.wxSTC_ESCRIPT_WORD3 wxSTC_CMD_REDO = stc_c.wxSTC_CMD_REDO wxSTC_CMD_SELECTALL = stc_c.wxSTC_CMD_SELECTALL wxSTC_CMD_UNDO = stc_c.wxSTC_CMD_UNDO diff --git a/wxPython/setup.py b/wxPython/setup.py index fb919d5eab..270bfbb335 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -106,7 +106,7 @@ HYBRID = 1 # If set and not debug or FINAL, then build a # wxWindows must have been built with /MD, not /MDd # (using FINAL=hybrid will do it.) -WXDLLVER = '250' # Version part of wxWindows DLL name +WXDLLVER = '25' # Version part of wxWindows DLL name #---------------------------------------------------------------------- @@ -321,7 +321,8 @@ def makeLibName(name): if os.name == 'posix': libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE) else: - raise NotImplementedError + libname = "FUBAR" + #raise NotImplementedError return [libname] @@ -401,17 +402,18 @@ if os.name == 'nt': GENDIR = 'msw' includes = ['src', - opj(WXDIR, 'lib', 'mswdll' + libFlag()), + opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll'), opj(WXDIR, 'include'), + opj(WXDIR, 'contrib', 'include'), ] defines = [ ('WIN32', None), - ('__WIN32__', None), ('_WINDOWS', None), - ('__WINDOWS__', None), - ('WINVER', '0x0400'), - ('__WIN95__', None), - ('STRICT', None), +## ('__WIN32__', None), +## ('__WINDOWS__', None), +## ('WINVER', '0x0400'), +## ('__WIN95__', None), +## ('STRICT', None), (WXPLAT, None), ('WXUSINGDLL', '1'), @@ -428,7 +430,7 @@ if os.name == 'nt': if not FINAL or HYBRID: defines.append( ('__WXDEBUG__', None) ) - libdirs = [ opj(WXDIR, 'lib') ] + libdirs = [ opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll') ] wxdll = 'wxmsw' + WXDLLVER + libFlag() libs = [ wxdll ] @@ -786,7 +788,10 @@ if BUILD_OGL: if BUILD_STC: msg('Preparing STC...') location = 'contrib/stc' - STC_H = opj(WXPREFIX, 'include/wx/stc') + if os.name == 'nt': + STC_H = opj(WXDIR, 'contrib', 'include/wx/stc') + else: + STC_H = opj(WXPREFIX, 'include/wx/stc') ## NOTE: need to add this to the stc.bkl... diff --git a/wxPython/src/msw/calendar.py b/wxPython/src/msw/calendar.py index 355ee1bfa5..6dab932b4d 100644 --- a/wxPython/src/msw/calendar.py +++ b/wxPython/src/msw/calendar.py @@ -42,71 +42,71 @@ class wxCalendarDateAttrPtr : self.this = this self.thisown = 0 def SetTextColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_SetTextColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_SetTextColour(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_SetBackgroundColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_SetBackgroundColour(self, *_args, **_kwargs) return val def SetBorderColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_SetBorderColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_SetBorderColour(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_SetFont,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_SetFont(self, *_args, **_kwargs) return val def SetBorder(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_SetBorder,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_SetBorder(self, *_args, **_kwargs) return val def SetHoliday(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_SetHoliday,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_SetHoliday(self, *_args, **_kwargs) return val def HasTextColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_HasTextColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_HasTextColour(self, *_args, **_kwargs) return val def HasBackgroundColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_HasBackgroundColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_HasBackgroundColour(self, *_args, **_kwargs) return val def HasBorderColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_HasBorderColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_HasBorderColour(self, *_args, **_kwargs) return val def HasFont(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_HasFont,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_HasFont(self, *_args, **_kwargs) return val def HasBorder(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_HasBorder,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_HasBorder(self, *_args, **_kwargs) return val def IsHoliday(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_IsHoliday,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_IsHoliday(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_GetTextColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_GetBackgroundColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetBorderColour(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_GetBorderColour,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_GetBorderColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetFont(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_GetFont,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetBorder(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarDateAttr_GetBorder,(self,) + _args, _kwargs) + val = calendarc.wxCalendarDateAttr_GetBorder(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCalendarDateAttr(wxCalendarDateAttrPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(calendarc.new_wxCalendarDateAttr,_args,_kwargs) + self.this = calendarc.new_wxCalendarDateAttr(*_args,**_kwargs) self.thisown = 1 def wxCalendarDateAttrBorder(*_args,**_kwargs): - val = wxCalendarDateAttrPtr(apply(calendarc.new_wxCalendarDateAttrBorder,_args,_kwargs)) + val = wxCalendarDateAttrPtr(calendarc.new_wxCalendarDateAttrBorder(*_args,**_kwargs)) val.thisown = 1 return val @@ -116,17 +116,17 @@ class wxCalendarEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetDate(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarEvent_GetDate,(self,) + _args, _kwargs) + val = calendarc.wxCalendarEvent_GetDate(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def GetWeekDay(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarEvent_GetWeekDay,(self,) + _args, _kwargs) + val = calendarc.wxCalendarEvent_GetWeekDay(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCalendarEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCalendarEvent(wxCalendarEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(calendarc.new_wxCalendarEvent,_args,_kwargs) + self.this = calendarc.new_wxCalendarEvent(*_args,**_kwargs) self.thisown = 1 @@ -137,108 +137,108 @@ class wxCalendarCtrlPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_Create,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_Create(self, *_args, **_kwargs) return val def SetDate(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetDate,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetDate(self, *_args, **_kwargs) return val def GetDate(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetDate,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetDate(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetLowerDateLimit(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetLowerDateLimit,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetLowerDateLimit(self, *_args, **_kwargs) return val def GetLowerDateLimit(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetLowerDateLimit,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetLowerDateLimit(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetUpperDateLimit(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetUpperDateLimit,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetUpperDateLimit(self, *_args, **_kwargs) return val def GetUpperDateLimit(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetUpperDateLimit,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetUpperDateLimit(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetDateRange(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetDateRange,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetDateRange(self, *_args, **_kwargs) return val def EnableYearChange(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_EnableYearChange,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_EnableYearChange(self, *_args, **_kwargs) return val def EnableMonthChange(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_EnableMonthChange,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_EnableMonthChange(self, *_args, **_kwargs) return val def EnableHolidayDisplay(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_EnableHolidayDisplay,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_EnableHolidayDisplay(self, *_args, **_kwargs) return val def SetHeaderColours(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetHeaderColours,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetHeaderColours(self, *_args, **_kwargs) return val def GetHeaderColourFg(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetHeaderColourFg,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetHeaderColourFg(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetHeaderColourBg(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetHeaderColourBg,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetHeaderColourBg(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetHighlightColours(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetHighlightColours,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetHighlightColours(self, *_args, **_kwargs) return val def GetHighlightColourFg(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetHighlightColourFg,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetHighlightColourFg(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetHighlightColourBg(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetHighlightColourBg,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetHighlightColourBg(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetHolidayColours(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetHolidayColours,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetHolidayColours(self, *_args, **_kwargs) return val def GetHolidayColourFg(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetHolidayColourFg,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetHolidayColourFg(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetHolidayColourBg(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetHolidayColourBg,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetHolidayColourBg(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetAttr(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_GetAttr,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_GetAttr(self, *_args, **_kwargs) if val: val = wxCalendarDateAttrPtr(val) return val def SetAttr(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetAttr,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetAttr(self, *_args, **_kwargs) return val def SetHoliday(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_SetHoliday,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_SetHoliday(self, *_args, **_kwargs) return val def ResetAttr(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_ResetAttr,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_ResetAttr(self, *_args, **_kwargs) return val def HitTest(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_HitTest,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_HitTest(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_Enable,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_Enable(self, *_args, **_kwargs) return val def Show(self, *_args, **_kwargs): - val = apply(calendarc.wxCalendarCtrl_Show,(self,) + _args, _kwargs) + val = calendarc.wxCalendarCtrl_Show(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCalendarCtrl(wxCalendarCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(calendarc.new_wxCalendarCtrl,_args,_kwargs) + self.this = calendarc.new_wxCalendarCtrl(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreCalendarCtrl(*_args,**_kwargs): - val = wxCalendarCtrlPtr(apply(calendarc.new_wxPreCalendarCtrl,_args,_kwargs)) + val = wxCalendarCtrlPtr(calendarc.new_wxPreCalendarCtrl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val diff --git a/wxPython/src/msw/clip_dnd.cpp b/wxPython/src/msw/clip_dnd.cpp index 5befae339d..1aa9f493a9 100644 --- a/wxPython/src/msw/clip_dnd.cpp +++ b/wxPython/src/msw/clip_dnd.cpp @@ -198,9 +198,7 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) { } #include - - // See below in the init function... - wxClipboard* wxPyTheClipboard; +extern wxClipboard * wxTheClipboard; class wxPyDropSource : public wxDropSource { public: @@ -366,17 +364,17 @@ static PyObject *_wrap_wxPyFormatInvalid_get() { return pyobj; } -static int _wrap_wxPyTheClipboard_set(PyObject *val) { +static int _wrap_wxTheClipboard_set(PyObject *val) { PyErr_SetString(PyExc_TypeError,"Variable wxTheClipboard is read-only."); return 1; } -static PyObject *_wrap_wxPyTheClipboard_get() { +static PyObject *_wrap_wxTheClipboard_get() { PyObject * pyobj; char ptemp[128]; - SWIG_MakePtr(ptemp, (char *) wxPyTheClipboard,"_wxClipboard_p"); + SWIG_MakePtr(ptemp, (char *) wxTheClipboard,"_wxClipboard_p"); pyobj = PyString_FromString(ptemp); return pyobj; } @@ -3834,7 +3832,7 @@ SWIGEXPORT(void) initclip_dndc() { PyDict_SetItemString(d,"wxDF_MAX", PyInt_FromLong((long) wxDF_MAX)); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxFormatInvalid",_wrap_wxPyFormatInvalid_get, _wrap_wxPyFormatInvalid_set); - SWIG_addvarlink(SWIG_globals,"wxTheClipboard",_wrap_wxPyTheClipboard_get, _wrap_wxPyTheClipboard_set); + SWIG_addvarlink(SWIG_globals,"wxTheClipboard",_wrap_wxTheClipboard_get, _wrap_wxTheClipboard_set); PyDict_SetItemString(d,"wxDrag_CopyOnly", PyInt_FromLong((long) wxDrag_CopyOnly)); PyDict_SetItemString(d,"wxDrag_AllowMove", PyInt_FromLong((long) wxDrag_AllowMove)); PyDict_SetItemString(d,"wxDrag_DefaultMove", PyInt_FromLong((long) wxDrag_DefaultMove)); @@ -3846,7 +3844,6 @@ SWIGEXPORT(void) initclip_dndc() { PyDict_SetItemString(d,"wxDragCancel", PyInt_FromLong((long) wxDragCancel)); - wxPyTheClipboard = wxTheClipboard; wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource"); wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget"); wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget"); diff --git a/wxPython/src/msw/clip_dnd.py b/wxPython/src/msw/clip_dnd.py index fd3400e661..6552143ecc 100644 --- a/wxPython/src/msw/clip_dnd.py +++ b/wxPython/src/msw/clip_dnd.py @@ -18,22 +18,22 @@ class wxDataFormatPtr : except: pass def SetType(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataFormat_SetType,(self,) + _args, _kwargs) + val = clip_dndc.wxDataFormat_SetType(self, *_args, **_kwargs) return val def GetType(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataFormat_GetType,(self,) + _args, _kwargs) + val = clip_dndc.wxDataFormat_GetType(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataFormat_GetId,(self,) + _args, _kwargs) + val = clip_dndc.wxDataFormat_GetId(self, *_args, **_kwargs) return val def SetId(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataFormat_SetId,(self,) + _args, _kwargs) + val = clip_dndc.wxDataFormat_SetId(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDataFormat instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDataFormat(wxDataFormatPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxDataFormat,_args,_kwargs) + self.this = clip_dndc.new_wxDataFormat(*_args,**_kwargs) self.thisown = 1 @@ -53,29 +53,29 @@ class wxDataObjectPtr : except: pass def GetPreferredFormat(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObject_GetPreferredFormat,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObject_GetPreferredFormat(self, *_args, **_kwargs) if val: val = wxDataFormatPtr(val) ; val.thisown = 1 return val def GetFormatCount(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObject_GetFormatCount,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObject_GetFormatCount(self, *_args, **_kwargs) return val def GetAllFormats(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObject_GetAllFormats,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObject_GetAllFormats(self, *_args, **_kwargs) return val def GetDataHere(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObject_GetDataHere,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObject_GetDataHere(self, *_args, **_kwargs) return val def GetDataSize(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObject_GetDataSize,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObject_GetDataSize(self, *_args, **_kwargs) return val def SetData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObject_SetData,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObject_SetData(self, *_args, **_kwargs) return val def IsSupportedFormat(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObject_IsSupportedFormat,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObject_IsSupportedFormat(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDataObject(wxDataObjectPtr): def __init__(self,this): self.this = this @@ -88,17 +88,17 @@ class wxDataObjectSimplePtr(wxDataObjectPtr): self.this = this self.thisown = 0 def GetFormat(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObjectSimple_GetFormat,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObjectSimple_GetFormat(self, *_args, **_kwargs) if val: val = wxDataFormatPtr(val) return val def SetFormat(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObjectSimple_SetFormat,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObjectSimple_SetFormat(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDataObjectSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDataObjectSimple(wxDataObjectSimplePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxDataObjectSimple,_args,_kwargs) + self.this = clip_dndc.new_wxDataObjectSimple(*_args,**_kwargs) self.thisown = 1 @@ -109,13 +109,13 @@ class wxPyDataObjectSimplePtr(wxDataObjectSimplePtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDataObjectSimple__setCallbackInfo,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDataObjectSimple__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyDataObjectSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyDataObjectSimple(wxPyDataObjectSimplePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxPyDataObjectSimple,_args,_kwargs) + self.this = clip_dndc.new_wxPyDataObjectSimple(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyDataObjectSimple) @@ -127,14 +127,14 @@ class wxDataObjectCompositePtr(wxDataObjectPtr): self.this = this self.thisown = 0 def Add(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDataObjectComposite_Add,(self,) + _args, _kwargs) + val = clip_dndc.wxDataObjectComposite_Add(self, *_args, **_kwargs) _args[0].thisown = 0 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDataObjectComposite instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDataObjectComposite(wxDataObjectCompositePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxDataObjectComposite,_args,_kwargs) + self.this = clip_dndc.new_wxDataObjectComposite(*_args,**_kwargs) self.thisown = 1 @@ -145,19 +145,19 @@ class wxTextDataObjectPtr(wxDataObjectSimplePtr): self.this = this self.thisown = 0 def GetTextLength(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDataObject_GetTextLength,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDataObject_GetTextLength(self, *_args, **_kwargs) return val def GetText(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDataObject_GetText,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDataObject_GetText(self, *_args, **_kwargs) return val def SetText(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDataObject_SetText,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDataObject_SetText(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTextDataObject(wxTextDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxTextDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxTextDataObject(*_args,**_kwargs) self.thisown = 1 @@ -168,13 +168,13 @@ class wxPyTextDataObjectPtr(wxTextDataObjectPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyTextDataObject__setCallbackInfo,(self,) + _args, _kwargs) + val = clip_dndc.wxPyTextDataObject__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyTextDataObject(wxPyTextDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxPyTextDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxPyTextDataObject(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyTextDataObject) @@ -186,17 +186,17 @@ class wxBitmapDataObjectPtr(wxDataObjectSimplePtr): self.this = this self.thisown = 0 def GetBitmap(self, *_args, **_kwargs): - val = apply(clip_dndc.wxBitmapDataObject_GetBitmap,(self,) + _args, _kwargs) + val = clip_dndc.wxBitmapDataObject_GetBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def SetBitmap(self, *_args, **_kwargs): - val = apply(clip_dndc.wxBitmapDataObject_SetBitmap,(self,) + _args, _kwargs) + val = clip_dndc.wxBitmapDataObject_SetBitmap(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBitmapDataObject(wxBitmapDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxBitmapDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxBitmapDataObject(*_args,**_kwargs) self.thisown = 1 @@ -207,13 +207,13 @@ class wxPyBitmapDataObjectPtr(wxBitmapDataObjectPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyBitmapDataObject__setCallbackInfo,(self,) + _args, _kwargs) + val = clip_dndc.wxPyBitmapDataObject__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyBitmapDataObject(wxPyBitmapDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxPyBitmapDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxPyBitmapDataObject(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyBitmapDataObject) @@ -225,16 +225,16 @@ class wxFileDataObjectPtr(wxDataObjectSimplePtr): self.this = this self.thisown = 0 def GetFilenames(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDataObject_GetFilenames,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDataObject_GetFilenames(self, *_args, **_kwargs) return val def AddFile(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDataObject_AddFile,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDataObject_AddFile(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileDataObject(wxFileDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxFileDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxFileDataObject(*_args,**_kwargs) self.thisown = 1 @@ -245,22 +245,22 @@ class wxCustomDataObjectPtr(wxDataObjectSimplePtr): self.this = this self.thisown = 0 def TakeData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxCustomDataObject_TakeData,(self,) + _args, _kwargs) + val = clip_dndc.wxCustomDataObject_TakeData(self, *_args, **_kwargs) return val def SetData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxCustomDataObject_SetData,(self,) + _args, _kwargs) + val = clip_dndc.wxCustomDataObject_SetData(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(clip_dndc.wxCustomDataObject_GetSize,(self,) + _args, _kwargs) + val = clip_dndc.wxCustomDataObject_GetSize(self, *_args, **_kwargs) return val def GetData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxCustomDataObject_GetData,(self,) + _args, _kwargs) + val = clip_dndc.wxCustomDataObject_GetData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCustomDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCustomDataObject(wxCustomDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxCustomDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxCustomDataObject(*_args,**_kwargs) self.thisown = 1 @@ -271,16 +271,16 @@ class wxURLDataObjectPtr(wxDataObjectCompositePtr): self.this = this self.thisown = 0 def GetURL(self, *_args, **_kwargs): - val = apply(clip_dndc.wxURLDataObject_GetURL,(self,) + _args, _kwargs) + val = clip_dndc.wxURLDataObject_GetURL(self, *_args, **_kwargs) return val def SetURL(self, *_args, **_kwargs): - val = apply(clip_dndc.wxURLDataObject_SetURL,(self,) + _args, _kwargs) + val = clip_dndc.wxURLDataObject_SetURL(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxURLDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxURLDataObject(wxURLDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxURLDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxURLDataObject(*_args,**_kwargs) self.thisown = 1 @@ -291,16 +291,16 @@ class wxMetafileDataObjectPtr(wxDataObjectSimplePtr): self.this = this self.thisown = 0 def SetMetafile(self, *_args, **_kwargs): - val = apply(clip_dndc.wxMetafileDataObject_SetMetafile,(self,) + _args, _kwargs) + val = clip_dndc.wxMetafileDataObject_SetMetafile(self, *_args, **_kwargs) return val def GetMetafile(self, *_args, **_kwargs): - val = apply(clip_dndc.wxMetafileDataObject_GetMetafile,(self,) + _args, _kwargs) + val = clip_dndc.wxMetafileDataObject_GetMetafile(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMetafileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMetafileDataObject(wxMetafileDataObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxMetafileDataObject,_args,_kwargs) + self.this = clip_dndc.new_wxMetafileDataObject(*_args,**_kwargs) self.thisown = 1 @@ -311,42 +311,42 @@ class wxClipboardPtr(wxObjectPtr): self.this = this self.thisown = 0 def Open(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_Open,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_Open(self, *_args, **_kwargs) return val def Close(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_Close,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_Close(self, *_args, **_kwargs) return val def IsOpened(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_IsOpened,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_IsOpened(self, *_args, **_kwargs) return val def AddData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_AddData,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_AddData(self, *_args, **_kwargs) _args[0].thisown = 0 return val def SetData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_SetData,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_SetData(self, *_args, **_kwargs) _args[0].thisown = 0 return val def IsSupported(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_IsSupported,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_IsSupported(self, *_args, **_kwargs) return val def GetData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_GetData,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_GetData(self, *_args, **_kwargs) return val def Clear(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_Clear,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_Clear(self, *_args, **_kwargs) return val def Flush(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_Flush,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_Flush(self, *_args, **_kwargs) return val def UsePrimarySelection(self, *_args, **_kwargs): - val = apply(clip_dndc.wxClipboard_UsePrimarySelection,(self,) + _args, _kwargs) + val = clip_dndc.wxClipboard_UsePrimarySelection(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxClipboard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxClipboard(wxClipboardPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxClipboard,_args,_kwargs) + self.this = clip_dndc.new_wxClipboard(*_args,**_kwargs) self.thisown = 1 @@ -357,7 +357,7 @@ class wxDropSourcePtr : self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDropSource__setCallbackInfo,(self,) + _args, _kwargs) + val = clip_dndc.wxDropSource__setCallbackInfo(self, *_args, **_kwargs) return val def __del__(self, delfunc=clip_dndc.delete_wxDropSource): if self.thisown == 1: @@ -366,26 +366,26 @@ class wxDropSourcePtr : except: pass def SetData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDropSource_SetData,(self,) + _args, _kwargs) + val = clip_dndc.wxDropSource_SetData(self, *_args, **_kwargs) return val def GetDataObject(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDropSource_GetDataObject,(self,) + _args, _kwargs) + val = clip_dndc.wxDropSource_GetDataObject(self, *_args, **_kwargs) if val: val = wxDataObjectPtr(val) return val def SetCursor(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDropSource_SetCursor,(self,) + _args, _kwargs) + val = clip_dndc.wxDropSource_SetCursor(self, *_args, **_kwargs) return val def DoDragDrop(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDropSource_DoDragDrop,(self,) + _args, _kwargs) + val = clip_dndc.wxDropSource_DoDragDrop(self, *_args, **_kwargs) return val def base_GiveFeedback(self, *_args, **_kwargs): - val = apply(clip_dndc.wxDropSource_base_GiveFeedback,(self,) + _args, _kwargs) + val = clip_dndc.wxDropSource_base_GiveFeedback(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDropSource(wxDropSourcePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxDropSource,_args,_kwargs) + self.this = clip_dndc.new_wxDropSource(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxDropSource, 0) @@ -397,7 +397,7 @@ class wxDropTargetPtr : self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDropTarget(wxDropTargetPtr): def __init__(self,this): self.this = this @@ -410,7 +410,7 @@ class wxPyDropTargetPtr(wxDropTargetPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget__setCallbackInfo,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget__setCallbackInfo(self, *_args, **_kwargs) return val def __del__(self, delfunc=clip_dndc.delete_wxPyDropTarget): if self.thisown == 1: @@ -419,33 +419,33 @@ class wxPyDropTargetPtr(wxDropTargetPtr): except: pass def GetDataObject(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget_GetDataObject,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget_GetDataObject(self, *_args, **_kwargs) if val: val = wxDataObjectPtr(val) return val def SetDataObject(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget_SetDataObject,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget_SetDataObject(self, *_args, **_kwargs) if _args:_args[0].thisown = 0 return val def base_OnEnter(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget_base_OnEnter,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget_base_OnEnter(self, *_args, **_kwargs) return val def base_OnDragOver(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget_base_OnDragOver,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget_base_OnDragOver(self, *_args, **_kwargs) return val def base_OnLeave(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget_base_OnLeave,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget_base_OnLeave(self, *_args, **_kwargs) return val def base_OnDrop(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget_base_OnDrop,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget_base_OnDrop(self, *_args, **_kwargs) return val def GetData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxPyDropTarget_GetData,(self,) + _args, _kwargs) + val = clip_dndc.wxPyDropTarget_GetData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyDropTarget(wxPyDropTargetPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxPyDropTarget,_args,_kwargs) + self.this = clip_dndc.new_wxPyDropTarget(*_args,**_kwargs) self.thisown = 1 if _args:_args[0].thisown = 0 self._setCallbackInfo(self, wxPyDropTarget) @@ -458,28 +458,28 @@ class wxTextDropTargetPtr(wxPyDropTargetPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDropTarget__setCallbackInfo,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDropTarget__setCallbackInfo(self, *_args, **_kwargs) return val def base_OnEnter(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDropTarget_base_OnEnter,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDropTarget_base_OnEnter(self, *_args, **_kwargs) return val def base_OnDragOver(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDropTarget_base_OnDragOver,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDropTarget_base_OnDragOver(self, *_args, **_kwargs) return val def base_OnLeave(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDropTarget_base_OnLeave,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDropTarget_base_OnLeave(self, *_args, **_kwargs) return val def base_OnDrop(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDropTarget_base_OnDrop,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDropTarget_base_OnDrop(self, *_args, **_kwargs) return val def base_OnData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxTextDropTarget_base_OnData,(self,) + _args, _kwargs) + val = clip_dndc.wxTextDropTarget_base_OnData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTextDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTextDropTarget(wxTextDropTargetPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxTextDropTarget,_args,_kwargs) + self.this = clip_dndc.new_wxTextDropTarget(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxTextDropTarget) @@ -491,28 +491,28 @@ class wxFileDropTargetPtr(wxPyDropTargetPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDropTarget__setCallbackInfo,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDropTarget__setCallbackInfo(self, *_args, **_kwargs) return val def base_OnEnter(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDropTarget_base_OnEnter,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDropTarget_base_OnEnter(self, *_args, **_kwargs) return val def base_OnDragOver(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDropTarget_base_OnDragOver,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDropTarget_base_OnDragOver(self, *_args, **_kwargs) return val def base_OnLeave(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDropTarget_base_OnLeave,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDropTarget_base_OnLeave(self, *_args, **_kwargs) return val def base_OnDrop(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDropTarget_base_OnDrop,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDropTarget_base_OnDrop(self, *_args, **_kwargs) return val def base_OnData(self, *_args, **_kwargs): - val = apply(clip_dndc.wxFileDropTarget_base_OnData,(self,) + _args, _kwargs) + val = clip_dndc.wxFileDropTarget_base_OnData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileDropTarget(wxFileDropTargetPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(clip_dndc.new_wxFileDropTarget,_args,_kwargs) + self.this = clip_dndc.new_wxFileDropTarget(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxFileDropTarget) @@ -524,7 +524,7 @@ class wxFileDropTarget(wxFileDropTargetPtr): #-------------- FUNCTION WRAPPERS ------------------ def wxCustomDataFormat(*_args, **_kwargs): - val = apply(clip_dndc.wxCustomDataFormat,_args,_kwargs) + val = clip_dndc.wxCustomDataFormat(*_args,**_kwargs) if val: val = wxDataFormatPtr(val); val.thisown = 1 return val diff --git a/wxPython/src/msw/cmndlgs.cpp b/wxPython/src/msw/cmndlgs.cpp index 6b9346d5a3..0a1317acd9 100644 --- a/wxPython/src/msw/cmndlgs.cpp +++ b/wxPython/src/msw/cmndlgs.cpp @@ -972,502 +972,474 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject return _resultobj; } -#define wxFileDialog_GetDirectory(_swigobj) (_swigobj->GetDirectory()) -static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_SetMessage(_swigobj,_swigarg0) (_swigobj->SetMessage(_swigarg0)) +static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; wxFileDialog * _arg0; + wxString * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","message", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetDirectory",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetMessage",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetDirectory. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetMessage. Expected _wxFileDialog_p."); return NULL; } } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxFileDialog_GetDirectory(_arg0)); + wxFileDialog_SetMessage(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} Py_INCREF(Py_None); + _resultobj = Py_None; { - delete _result; + if (_obj1) + delete _arg1; } return _resultobj; } -#define wxFileDialog_GetFilename(_swigobj) (_swigobj->GetFilename()) -static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_SetPath(_swigobj,_swigarg0) (_swigobj->SetPath(_swigarg0)) +static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; wxFileDialog * _arg0; + wxString * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","path", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilename",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetPath",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilename. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetPath. Expected _wxFileDialog_p."); return NULL; } } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxFileDialog_GetFilename(_arg0)); + wxFileDialog_SetPath(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} Py_INCREF(Py_None); + _resultobj = Py_None; { - delete _result; + if (_obj1) + delete _arg1; } return _resultobj; } -#define wxFileDialog_GetFilterIndex(_swigobj) (_swigobj->GetFilterIndex()) -static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_SetDirectory(_swigobj,_swigarg0) (_swigobj->SetDirectory(_swigarg0)) +static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; wxFileDialog * _arg0; + wxString * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","dir", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilterIndex",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetDirectory",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilterIndex. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetDirectory. Expected _wxFileDialog_p."); return NULL; } } { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxFileDialog_GetFilterIndex(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxFileDialog_GetMessage(_swigobj) (_swigobj->GetMessage()) -static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxString * _result; - wxFileDialog * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetMessage",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetMessage. Expected _wxFileDialog_p."); + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) return NULL; - } - } +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxFileDialog_GetMessage(_arg0)); + wxFileDialog_SetDirectory(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} Py_INCREF(Py_None); + _resultobj = Py_None; { - delete _result; + if (_obj1) + delete _arg1; } return _resultobj; } -#define wxFileDialog_GetPath(_swigobj) (_swigobj->GetPath()) -static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_SetFilename(_swigobj,_swigarg0) (_swigobj->SetFilename(_swigarg0)) +static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; wxFileDialog * _arg0; + wxString * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","name", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetPath",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetFilename",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetPath. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilename. Expected _wxFileDialog_p."); return NULL; } } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxFileDialog_GetPath(_arg0)); + wxFileDialog_SetFilename(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} +} Py_INCREF(Py_None); + _resultobj = Py_None; { - delete _result; + if (_obj1) + delete _arg1; } return _resultobj; } -#define wxFileDialog_GetStyle(_swigobj) (_swigobj->GetStyle()) -static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_SetWildcard(_swigobj,_swigarg0) (_swigobj->SetWildcard(_swigarg0)) +static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; wxFileDialog * _arg0; + wxString * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","wildCard", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetStyle",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetWildcard",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetStyle. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetWildcard. Expected _wxFileDialog_p."); return NULL; } } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (long )wxFileDialog_GetStyle(_arg0); + wxFileDialog_SetWildcard(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("l",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} return _resultobj; } -#define wxFileDialog_GetWildcard(_swigobj) (_swigobj->GetWildcard()) -static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) +static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; wxFileDialog * _arg0; + long _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","style", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetWildcard",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxFileDialog_SetStyle",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetWildcard. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetStyle. Expected _wxFileDialog_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxFileDialog_GetWildcard(_arg0)); + wxFileDialog_SetStyle(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} -{ - delete _result; -} +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxFileDialog_SetDirectory(_swigobj,_swigarg0) (_swigobj->SetDirectory(_swigarg0)) -static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_SetFilterIndex(_swigobj,_swigarg0) (_swigobj->SetFilterIndex(_swigarg0)) +static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFileDialog * _arg0; - wxString * _arg1; + int _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","directory", NULL }; + char *_kwnames[] = { "self","filterIndex", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetDirectory",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFileDialog_SetFilterIndex",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetDirectory. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilterIndex. Expected _wxFileDialog_p."); return NULL; } } -{ - _arg1 = wxString_in_helper(_obj1); - if (_arg1 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFileDialog_SetDirectory(_arg0,*_arg1); + wxFileDialog_SetFilterIndex(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; -{ - if (_obj1) - delete _arg1; -} return _resultobj; } -#define wxFileDialog_SetFilename(_swigobj,_swigarg0) (_swigobj->SetFilename(_swigarg0)) -static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_GetMessage(_swigobj) (_swigobj->GetMessage()) +static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxString * _result; wxFileDialog * _arg0; - wxString * _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","setfilename", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetFilename",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetMessage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilename. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetMessage. Expected _wxFileDialog_p."); return NULL; } } -{ - _arg1 = wxString_in_helper(_obj1); - if (_arg1 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFileDialog_SetFilename(_arg0,*_arg1); + _result = new wxString (wxFileDialog_GetMessage(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} { - if (_obj1) - delete _arg1; + delete _result; } return _resultobj; } -#define wxFileDialog_SetFilterIndex(_swigobj,_swigarg0) (_swigobj->SetFilterIndex(_swigarg0)) -static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_GetPath(_swigobj) (_swigobj->GetPath()) +static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxString * _result; wxFileDialog * _arg0; - int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","filterIndex", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFileDialog_SetFilterIndex",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetPath",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetFilterIndex. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetPath. Expected _wxFileDialog_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFileDialog_SetFilterIndex(_arg0,_arg1); + _result = new wxString (wxFileDialog_GetPath(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + delete _result; +} return _resultobj; } -#define wxFileDialog_SetMessage(_swigobj,_swigarg0) (_swigobj->SetMessage(_swigarg0)) -static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_GetDirectory(_swigobj) (_swigobj->GetDirectory()) +static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxString * _result; wxFileDialog * _arg0; - wxString * _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","message", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetMessage",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetDirectory",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetMessage. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetDirectory. Expected _wxFileDialog_p."); return NULL; } } -{ - _arg1 = wxString_in_helper(_obj1); - if (_arg1 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFileDialog_SetMessage(_arg0,*_arg1); + _result = new wxString (wxFileDialog_GetDirectory(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} { - if (_obj1) - delete _arg1; + delete _result; } return _resultobj; } -#define wxFileDialog_SetPath(_swigobj,_swigarg0) (_swigobj->SetPath(_swigarg0)) -static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_GetFilename(_swigobj) (_swigobj->GetFilename()) +static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxString * _result; wxFileDialog * _arg0; - wxString * _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","path", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetPath",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilename",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetPath. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilename. Expected _wxFileDialog_p."); return NULL; } } -{ - _arg1 = wxString_in_helper(_obj1); - if (_arg1 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFileDialog_SetPath(_arg0,*_arg1); + _result = new wxString (wxFileDialog_GetFilename(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} { - if (_obj1) - delete _arg1; + delete _result; } return _resultobj; } -#define wxFileDialog_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) -static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_GetWildcard(_swigobj) (_swigobj->GetWildcard()) +static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxString * _result; wxFileDialog * _arg0; - long _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","style", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxFileDialog_SetStyle",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetWildcard",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetStyle. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetWildcard. Expected _wxFileDialog_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFileDialog_SetStyle(_arg0,_arg1); + _result = new wxString (wxFileDialog_GetWildcard(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + delete _result; +} return _resultobj; } -#define wxFileDialog_SetWildcard(_swigobj,_swigarg0) (_swigobj->SetWildcard(_swigarg0)) -static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_GetStyle(_swigobj) (_swigobj->GetStyle()) +static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + long _result; wxFileDialog * _arg0; - wxString * _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","wildCard", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetWildcard",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetStyle",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_SetWildcard. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetStyle. Expected _wxFileDialog_p."); return NULL; } } -{ - _arg1 = wxString_in_helper(_obj1); - if (_arg1 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFileDialog_SetWildcard(_arg0,*_arg1); + _result = (long )wxFileDialog_GetStyle(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; -{ - if (_obj1) - delete _arg1; -} +} _resultobj = Py_BuildValue("l",_result); return _resultobj; } -#define wxFileDialog_ShowModal(_swigobj) (_swigobj->ShowModal()) -static PyObject *_wrap_wxFileDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFileDialog_GetFilterIndex(_swigobj) (_swigobj->GetFilterIndex()) +static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxFileDialog * _arg0; @@ -1475,18 +1447,18 @@ static PyObject *_wrap_wxFileDialog_ShowModal(PyObject *self, PyObject *args, Py char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_ShowModal",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilterIndex",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_ShowModal. Expected _wxFileDialog_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileDialog_GetFilterIndex. Expected _wxFileDialog_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxFileDialog_ShowModal(_arg0); + _result = (int )wxFileDialog_GetFilterIndex(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4040,21 +4012,20 @@ static PyMethodDef cmndlgscMethods[] = { { "new_wxMultiChoiceDialog", (PyCFunction) _wrap_new_wxMultiChoiceDialog, METH_VARARGS | METH_KEYWORDS }, { "wxFileDialog_GetPaths", (PyCFunction) _wrap_wxFileDialog_GetPaths, METH_VARARGS | METH_KEYWORDS }, { "wxFileDialog_GetFilenames", (PyCFunction) _wrap_wxFileDialog_GetFilenames, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_ShowModal", (PyCFunction) _wrap_wxFileDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_SetWildcard", (PyCFunction) _wrap_wxFileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_SetStyle", (PyCFunction) _wrap_wxFileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_SetPath", (PyCFunction) _wrap_wxFileDialog_SetPath, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_SetMessage", (PyCFunction) _wrap_wxFileDialog_SetMessage, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_SetFilterIndex", (PyCFunction) _wrap_wxFileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_SetFilename", (PyCFunction) _wrap_wxFileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_SetDirectory", (PyCFunction) _wrap_wxFileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_GetWildcard", (PyCFunction) _wrap_wxFileDialog_GetWildcard, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_GetStyle", (PyCFunction) _wrap_wxFileDialog_GetStyle, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_GetPath", (PyCFunction) _wrap_wxFileDialog_GetPath, METH_VARARGS | METH_KEYWORDS }, - { "wxFileDialog_GetMessage", (PyCFunction) _wrap_wxFileDialog_GetMessage, METH_VARARGS | METH_KEYWORDS }, { "wxFileDialog_GetFilterIndex", (PyCFunction) _wrap_wxFileDialog_GetFilterIndex, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_GetStyle", (PyCFunction) _wrap_wxFileDialog_GetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_GetWildcard", (PyCFunction) _wrap_wxFileDialog_GetWildcard, METH_VARARGS | METH_KEYWORDS }, { "wxFileDialog_GetFilename", (PyCFunction) _wrap_wxFileDialog_GetFilename, METH_VARARGS | METH_KEYWORDS }, { "wxFileDialog_GetDirectory", (PyCFunction) _wrap_wxFileDialog_GetDirectory, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_GetPath", (PyCFunction) _wrap_wxFileDialog_GetPath, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_GetMessage", (PyCFunction) _wrap_wxFileDialog_GetMessage, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_SetFilterIndex", (PyCFunction) _wrap_wxFileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_SetStyle", (PyCFunction) _wrap_wxFileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_SetWildcard", (PyCFunction) _wrap_wxFileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_SetFilename", (PyCFunction) _wrap_wxFileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_SetDirectory", (PyCFunction) _wrap_wxFileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_SetPath", (PyCFunction) _wrap_wxFileDialog_SetPath, METH_VARARGS | METH_KEYWORDS }, + { "wxFileDialog_SetMessage", (PyCFunction) _wrap_wxFileDialog_SetMessage, METH_VARARGS | METH_KEYWORDS }, { "new_wxFileDialog", (PyCFunction) _wrap_new_wxFileDialog, METH_VARARGS | METH_KEYWORDS }, { "wxDirDialog_ShowModal", (PyCFunction) _wrap_wxDirDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { "wxDirDialog_SetPath", (PyCFunction) _wrap_wxDirDialog_SetPath, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/cmndlgs.py b/wxPython/src/msw/cmndlgs.py index 9555d3bc82..c796fe6829 100644 --- a/wxPython/src/msw/cmndlgs.py +++ b/wxPython/src/msw/cmndlgs.py @@ -48,30 +48,30 @@ class wxColourDataPtr(wxObjectPtr): except: pass def GetChooseFull(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourData_GetChooseFull(self, *_args, **_kwargs) return val def GetColour(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourData_GetColour,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourData_GetColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetCustomColour(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourData_GetCustomColour,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourData_GetCustomColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetChooseFull(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourData_SetChooseFull,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourData_SetChooseFull(self, *_args, **_kwargs) return val def SetColour(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourData_SetColour,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourData_SetColour(self, *_args, **_kwargs) return val def SetCustomColour(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourData_SetCustomColour,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourData_SetCustomColour(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxColourData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxColourData(wxColourDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxColourData,_args,_kwargs) + self.this = cmndlgsc.new_wxColourData(*_args,**_kwargs) self.thisown = 1 @@ -82,17 +82,17 @@ class wxColourDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def GetColourData(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourDialog_GetColourData,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourDialog_GetColourData(self, *_args, **_kwargs) if val: val = wxColourDataPtr(val) return val def ShowModal(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxColourDialog_ShowModal,(self,) + _args, _kwargs) + val = cmndlgsc.wxColourDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxColourDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxColourDialog(wxColourDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxColourDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxColourDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -104,28 +104,28 @@ class wxDirDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def GetPath(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxDirDialog_GetPath,(self,) + _args, _kwargs) + val = cmndlgsc.wxDirDialog_GetPath(self, *_args, **_kwargs) return val def GetMessage(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxDirDialog_GetMessage,(self,) + _args, _kwargs) + val = cmndlgsc.wxDirDialog_GetMessage(self, *_args, **_kwargs) return val def GetStyle(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxDirDialog_GetStyle,(self,) + _args, _kwargs) + val = cmndlgsc.wxDirDialog_GetStyle(self, *_args, **_kwargs) return val def SetMessage(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxDirDialog_SetMessage,(self,) + _args, _kwargs) + val = cmndlgsc.wxDirDialog_SetMessage(self, *_args, **_kwargs) return val def SetPath(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxDirDialog_SetPath,(self,) + _args, _kwargs) + val = cmndlgsc.wxDirDialog_SetPath(self, *_args, **_kwargs) return val def ShowModal(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxDirDialog_ShowModal,(self,) + _args, _kwargs) + val = cmndlgsc.wxDirDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDirDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDirDialog(wxDirDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxDirDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxDirDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -136,62 +136,59 @@ class wxFileDialogPtr(wxDialogPtr): def __init__(self,this): self.this = this self.thisown = 0 - def GetDirectory(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetDirectory,(self,) + _args, _kwargs) - return val - def GetFilename(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetFilename,(self,) + _args, _kwargs) + def SetMessage(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_SetMessage(self, *_args, **_kwargs) return val - def GetFilterIndex(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetFilterIndex,(self,) + _args, _kwargs) + def SetPath(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_SetPath(self, *_args, **_kwargs) return val - def GetMessage(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetMessage,(self,) + _args, _kwargs) + def SetDirectory(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_SetDirectory(self, *_args, **_kwargs) return val - def GetPath(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetPath,(self,) + _args, _kwargs) + def SetFilename(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_SetFilename(self, *_args, **_kwargs) return val - def GetStyle(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetStyle,(self,) + _args, _kwargs) + def SetWildcard(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_SetWildcard(self, *_args, **_kwargs) return val - def GetWildcard(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetWildcard,(self,) + _args, _kwargs) + def SetStyle(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_SetStyle(self, *_args, **_kwargs) return val - def SetDirectory(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_SetDirectory,(self,) + _args, _kwargs) + def SetFilterIndex(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_SetFilterIndex(self, *_args, **_kwargs) return val - def SetFilename(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_SetFilename,(self,) + _args, _kwargs) + def GetMessage(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_GetMessage(self, *_args, **_kwargs) return val - def SetFilterIndex(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_SetFilterIndex,(self,) + _args, _kwargs) + def GetPath(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_GetPath(self, *_args, **_kwargs) return val - def SetMessage(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_SetMessage,(self,) + _args, _kwargs) + def GetDirectory(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_GetDirectory(self, *_args, **_kwargs) return val - def SetPath(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_SetPath,(self,) + _args, _kwargs) + def GetFilename(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_GetFilename(self, *_args, **_kwargs) return val - def SetStyle(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_SetStyle,(self,) + _args, _kwargs) + def GetWildcard(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_GetWildcard(self, *_args, **_kwargs) return val - def SetWildcard(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_SetWildcard,(self,) + _args, _kwargs) + def GetStyle(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_GetStyle(self, *_args, **_kwargs) return val - def ShowModal(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_ShowModal,(self,) + _args, _kwargs) + def GetFilterIndex(self, *_args, **_kwargs): + val = cmndlgsc.wxFileDialog_GetFilterIndex(self, *_args, **_kwargs) return val def GetFilenames(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetFilenames,(self,) + _args, _kwargs) + val = cmndlgsc.wxFileDialog_GetFilenames(self, *_args, **_kwargs) return val def GetPaths(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFileDialog_GetPaths,(self,) + _args, _kwargs) + val = cmndlgsc.wxFileDialog_GetPaths(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileDialog(wxFileDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxFileDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxFileDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -203,16 +200,16 @@ class wxMultiChoiceDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def SetSelections(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxMultiChoiceDialog_SetSelections,(self,) + _args, _kwargs) + val = cmndlgsc.wxMultiChoiceDialog_SetSelections(self, *_args, **_kwargs) return val def GetSelections(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxMultiChoiceDialog_GetSelections,(self,) + _args, _kwargs) + val = cmndlgsc.wxMultiChoiceDialog_GetSelections(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMultiChoiceDialog(wxMultiChoiceDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxMultiChoiceDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxMultiChoiceDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -224,22 +221,22 @@ class wxSingleChoiceDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def GetSelection(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxSingleChoiceDialog_GetSelection,(self,) + _args, _kwargs) + val = cmndlgsc.wxSingleChoiceDialog_GetSelection(self, *_args, **_kwargs) return val def GetStringSelection(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxSingleChoiceDialog_GetStringSelection,(self,) + _args, _kwargs) + val = cmndlgsc.wxSingleChoiceDialog_GetStringSelection(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxSingleChoiceDialog_SetSelection,(self,) + _args, _kwargs) + val = cmndlgsc.wxSingleChoiceDialog_SetSelection(self, *_args, **_kwargs) return val def ShowModal(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxSingleChoiceDialog_ShowModal,(self,) + _args, _kwargs) + val = cmndlgsc.wxSingleChoiceDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSingleChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSingleChoiceDialog(wxSingleChoiceDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxSingleChoiceDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -251,19 +248,19 @@ class wxTextEntryDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxTextEntryDialog_GetValue,(self,) + _args, _kwargs) + val = cmndlgsc.wxTextEntryDialog_GetValue(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxTextEntryDialog_SetValue,(self,) + _args, _kwargs) + val = cmndlgsc.wxTextEntryDialog_SetValue(self, *_args, **_kwargs) return val def ShowModal(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxTextEntryDialog_ShowModal,(self,) + _args, _kwargs) + val = cmndlgsc.wxTextEntryDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTextEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTextEntryDialog(wxTextEntryDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxTextEntryDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxTextEntryDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -281,52 +278,52 @@ class wxFontDataPtr(wxObjectPtr): except: pass def EnableEffects(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_EnableEffects(self, *_args, **_kwargs) return val def GetAllowSymbols(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_GetAllowSymbols,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_GetAllowSymbols(self, *_args, **_kwargs) return val def GetColour(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_GetColour,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_GetColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetChosenFont(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_GetChosenFont,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_GetChosenFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetEnableEffects(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_GetEnableEffects,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_GetEnableEffects(self, *_args, **_kwargs) return val def GetInitialFont(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_GetInitialFont,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_GetInitialFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetShowHelp(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_GetShowHelp,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_GetShowHelp(self, *_args, **_kwargs) return val def SetAllowSymbols(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_SetAllowSymbols,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_SetAllowSymbols(self, *_args, **_kwargs) return val def SetChosenFont(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_SetChosenFont,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_SetChosenFont(self, *_args, **_kwargs) return val def SetColour(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_SetColour,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_SetColour(self, *_args, **_kwargs) return val def SetInitialFont(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_SetInitialFont,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_SetInitialFont(self, *_args, **_kwargs) return val def SetRange(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_SetRange,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_SetRange(self, *_args, **_kwargs) return val def SetShowHelp(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontData_SetShowHelp,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontData_SetShowHelp(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFontData(wxFontDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxFontData,_args,_kwargs) + self.this = cmndlgsc.new_wxFontData(*_args,**_kwargs) self.thisown = 1 @@ -337,17 +334,17 @@ class wxFontDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def GetFontData(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontDialog_GetFontData,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontDialog_GetFontData(self, *_args, **_kwargs) if val: val = wxFontDataPtr(val) return val def ShowModal(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFontDialog_ShowModal,(self,) + _args, _kwargs) + val = cmndlgsc.wxFontDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFontDialog(wxFontDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxFontDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxFontDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -359,13 +356,13 @@ class wxMessageDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def ShowModal(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxMessageDialog_ShowModal,(self,) + _args, _kwargs) + val = cmndlgsc.wxMessageDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMessageDialog(wxMessageDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxMessageDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxMessageDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -377,16 +374,16 @@ class wxProgressDialogPtr(wxFramePtr): self.this = this self.thisown = 0 def Update(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxProgressDialog_Update,(self,) + _args, _kwargs) + val = cmndlgsc.wxProgressDialog_Update(self, *_args, **_kwargs) return val def Resume(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxProgressDialog_Resume,(self,) + _args, _kwargs) + val = cmndlgsc.wxProgressDialog_Resume(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxProgressDialog(wxProgressDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxProgressDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxProgressDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -398,32 +395,32 @@ class wxFindDialogEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetFlags(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindDialogEvent_GetFlags,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindDialogEvent_GetFlags(self, *_args, **_kwargs) return val def GetFindString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindDialogEvent_GetFindString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindDialogEvent_GetFindString(self, *_args, **_kwargs) return val def GetReplaceString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindDialogEvent_GetReplaceString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindDialogEvent_GetReplaceString(self, *_args, **_kwargs) return val def GetDialog(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindDialogEvent_GetDialog,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindDialogEvent_GetDialog(self, *_args, **_kwargs) if val: val = wxFindReplaceDialogPtr(val) return val def SetFlags(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindDialogEvent_SetFlags,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindDialogEvent_SetFlags(self, *_args, **_kwargs) return val def SetFindString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindDialogEvent_SetFindString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindDialogEvent_SetFindString(self, *_args, **_kwargs) return val def SetReplaceString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindDialogEvent_SetReplaceString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindDialogEvent_SetReplaceString(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFindDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFindDialogEvent(wxFindDialogEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxFindDialogEvent,_args,_kwargs) + self.this = cmndlgsc.new_wxFindDialogEvent(*_args,**_kwargs) self.thisown = 1 @@ -440,28 +437,28 @@ class wxFindReplaceDataPtr(wxObjectPtr): except: pass def GetFindString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceData_GetFindString(self, *_args, **_kwargs) return val def GetReplaceString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceData_GetReplaceString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceData_GetReplaceString(self, *_args, **_kwargs) return val def GetFlags(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceData_GetFlags,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceData_GetFlags(self, *_args, **_kwargs) return val def SetFlags(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceData_SetFlags,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceData_SetFlags(self, *_args, **_kwargs) return val def SetFindString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceData_SetFindString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceData_SetFindString(self, *_args, **_kwargs) return val def SetReplaceString(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceData_SetReplaceString,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceData_SetReplaceString(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFindReplaceData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFindReplaceData(wxFindReplaceDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxFindReplaceData,_args,_kwargs) + self.this = cmndlgsc.new_wxFindReplaceData(*_args,**_kwargs) self.thisown = 1 @@ -472,27 +469,27 @@ class wxFindReplaceDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceDialog_Create,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceDialog_Create(self, *_args, **_kwargs) return val def GetData(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceDialog_GetData,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceDialog_GetData(self, *_args, **_kwargs) if val: val = wxFindReplaceDataPtr(val) return val def SetData(self, *_args, **_kwargs): - val = apply(cmndlgsc.wxFindReplaceDialog_SetData,(self,) + _args, _kwargs) + val = cmndlgsc.wxFindReplaceDialog_SetData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFindReplaceDialog(wxFindReplaceDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(cmndlgsc.new_wxFindReplaceDialog,_args,_kwargs) + self.this = cmndlgsc.new_wxFindReplaceDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreFindReplaceDialog(*_args,**_kwargs): - val = wxFindReplaceDialogPtr(apply(cmndlgsc.new_wxPreFindReplaceDialog,_args,_kwargs)) + val = wxFindReplaceDialogPtr(cmndlgsc.new_wxPreFindReplaceDialog(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val diff --git a/wxPython/src/msw/controls.cpp b/wxPython/src/msw/controls.cpp index 7adbcc7212..22e9d12c77 100644 --- a/wxPython/src/msw/controls.cpp +++ b/wxPython/src/msw/controls.cpp @@ -1990,7 +1990,7 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject * PyObject * _obj4 = 0; PyObject * _argo6 = 0; PyObject * _obj7 = 0; - char *_kwnames[] = { "parent","id","label","pos","size","style","val","name", NULL }; + char *_kwnames[] = { "parent","id","label","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; @@ -2104,7 +2104,7 @@ static PyObject *_wrap_wxCheckBox_Create(PyObject *self, PyObject *args, PyObjec PyObject * _obj5 = 0; PyObject * _argo7 = 0; PyObject * _obj8 = 0; - char *_kwnames[] = { "self","parent","id","label","pos","size","style","val","name", NULL }; + char *_kwnames[] = { "self","parent","id","label","pos","size","style","validator","name", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOiO|OOlOO:wxCheckBox_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_obj5,&_arg6,&_argo7,&_obj8)) @@ -5741,23 +5741,24 @@ static PyObject *_wrap_wxCheckListBox_HitTestXY(PyObject *self, PyObject *args, return _resultobj; } -#define new_wxTextAttr(_swigarg0,_swigarg1,_swigarg2) (new wxTextAttr(_swigarg0,_swigarg1,_swigarg2)) +#define new_wxTextAttr(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxTextAttr(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) static PyObject *_wrap_new_wxTextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxTextAttr * _result; wxColour * _arg0 = (wxColour *) &wxNullColour; wxColour * _arg1 = (wxColour *) &wxNullColour; wxFont * _arg2 = (wxFont *) &wxNullFont; + wxTextAttrAlignment _arg3 = (wxTextAttrAlignment ) (wxTEXT_ALIGNMENT_DEFAULT); wxColour temp; PyObject * _obj0 = 0; wxColour temp0; PyObject * _obj1 = 0; PyObject * _argo2 = 0; - char *_kwnames[] = { "colText","colBack","font", NULL }; + char *_kwnames[] = { "colText","colBack","font","alignment", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OOO:new_wxTextAttr",_kwnames,&_obj0,&_obj1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OOOi:new_wxTextAttr",_kwnames,&_obj0,&_obj1,&_argo2,&_arg3)) return NULL; if (_obj0) { @@ -5779,7 +5780,7 @@ static PyObject *_wrap_new_wxTextAttr(PyObject *self, PyObject *args, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxTextAttr *)new_wxTextAttr(*_arg0,*_arg1,*_arg2); + _result = (wxTextAttr *)new_wxTextAttr(*_arg0,*_arg1,*_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5821,6 +5822,34 @@ static PyObject *_wrap_delete_wxTextAttr(PyObject *self, PyObject *args, PyObjec return _resultobj; } +#define wxTextAttr_Init(_swigobj) (_swigobj->Init()) +static PyObject *_wrap_wxTextAttr_Init(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_Init",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_Init. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTextAttr_Init(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxTextAttr_SetTextColour(_swigobj,_swigarg0) (_swigobj->SetTextColour(_swigarg0)) static PyObject *_wrap_wxTextAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5929,6 +5958,171 @@ static PyObject *_wrap_wxTextAttr_SetFont(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxTextAttr_SetAlignment(_swigobj,_swigarg0) (_swigobj->SetAlignment(_swigarg0)) +static PyObject *_wrap_wxTextAttr_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextAttr * _arg0; + wxTextAttrAlignment _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","alignment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxTextAttr_SetAlignment",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_SetAlignment. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTextAttr_SetAlignment(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTextAttr_SetTabs(_swigobj,_swigarg0) (_swigobj->SetTabs(_swigarg0)) +static PyObject *_wrap_wxTextAttr_SetTabs(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextAttr * _arg0; + wxArrayInt * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","tabs", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextAttr_SetTabs",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_SetTabs. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + if (! PySequence_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, "Sequence of integers expected."); + return NULL; + } + _arg1 = new wxArrayInt; + int i, len=PySequence_Length(_obj1); + for (i=0; iAdd(PyInt_AS_LONG(number)); + Py_DECREF(item); + Py_DECREF(number); + } +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTextAttr_SetTabs(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxTextAttr_SetLeftIndent(_swigobj,_swigarg0) (_swigobj->SetLeftIndent(_swigarg0)) +static PyObject *_wrap_wxTextAttr_SetLeftIndent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextAttr * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","indent", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxTextAttr_SetLeftIndent",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_SetLeftIndent. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTextAttr_SetLeftIndent(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTextAttr_SetRightIndent(_swigobj,_swigarg0) (_swigobj->SetRightIndent(_swigarg0)) +static PyObject *_wrap_wxTextAttr_SetRightIndent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextAttr * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","indent", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxTextAttr_SetRightIndent",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_SetRightIndent. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTextAttr_SetRightIndent(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTextAttr_SetFlags(_swigobj,_swigarg0) (_swigobj->SetFlags(_swigarg0)) +static PyObject *_wrap_wxTextAttr_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextAttr * _arg0; + long _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","flags", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextAttr_SetFlags",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_SetFlags. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTextAttr_SetFlags(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxTextAttr_HasTextColour(_swigobj) (_swigobj->HasTextColour()) static PyObject *_wrap_wxTextAttr_HasTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6013,6 +6207,147 @@ static PyObject *_wrap_wxTextAttr_HasFont(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxTextAttr_HasAlignment(_swigobj) (_swigobj->HasAlignment()) +static PyObject *_wrap_wxTextAttr_HasAlignment(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_HasAlignment",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_HasAlignment. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxTextAttr_HasAlignment(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxTextAttr_HasTabs(_swigobj) (_swigobj->HasTabs()) +static PyObject *_wrap_wxTextAttr_HasTabs(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_HasTabs",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_HasTabs. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxTextAttr_HasTabs(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxTextAttr_HasLeftIndent(_swigobj) (_swigobj->HasLeftIndent()) +static PyObject *_wrap_wxTextAttr_HasLeftIndent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_HasLeftIndent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_HasLeftIndent. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxTextAttr_HasLeftIndent(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxTextAttr_HasRightIndent(_swigobj) (_swigobj->HasRightIndent()) +static PyObject *_wrap_wxTextAttr_HasRightIndent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_HasRightIndent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_HasRightIndent. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxTextAttr_HasRightIndent(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxTextAttr_HasFlag(_swigobj,_swigarg0) (_swigobj->HasFlag(_swigarg0)) +static PyObject *_wrap_wxTextAttr_HasFlag(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxTextAttr * _arg0; + long _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","flag", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextAttr_HasFlag",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_HasFlag. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxTextAttr_HasFlag(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxTextAttr_GetTextColour(_swigobj) (_swigobj->GetTextColour()) static PyObject *_wrap_wxTextAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6103,6 +6438,155 @@ static PyObject *_wrap_wxTextAttr_GetFont(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxTextAttr_GetAlignment(_swigobj) (_swigobj->GetAlignment()) +static PyObject *_wrap_wxTextAttr_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextAttrAlignment _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_GetAlignment",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_GetAlignment. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxTextAttrAlignment )wxTextAttr_GetAlignment(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxTextAttr_GetTabs(_swigobj) (_swigobj->GetTabs()) +static PyObject *_wrap_wxTextAttr_GetTabs(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxArrayInt * _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_GetTabs",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_GetTabs. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxArrayInt & _result_ref = wxTextAttr_GetTabs(_arg0); + _result = (wxArrayInt *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ + _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; +} + +#define wxTextAttr_GetLeftIndent(_swigobj) (_swigobj->GetLeftIndent()) +static PyObject *_wrap_wxTextAttr_GetLeftIndent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_GetLeftIndent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_GetLeftIndent. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (long )wxTextAttr_GetLeftIndent(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxTextAttr_GetRightIndent(_swigobj) (_swigobj->GetRightIndent()) +static PyObject *_wrap_wxTextAttr_GetRightIndent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_GetRightIndent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_GetRightIndent. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (long )wxTextAttr_GetRightIndent(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxTextAttr_GetFlags(_swigobj) (_swigobj->GetFlags()) +static PyObject *_wrap_wxTextAttr_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _result; + wxTextAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextAttr_GetFlags",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextAttr_GetFlags. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (long )wxTextAttr_GetFlags(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxTextAttr_IsDefault(_swigobj) (_swigobj->IsDefault()) static PyObject *_wrap_wxTextAttr_IsDefault(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -7220,6 +7704,43 @@ static PyObject *_wrap_wxTextCtrl_GetDefaultStyle(PyObject *self, PyObject *args return _resultobj; } +#define wxTextCtrl_GetStyle(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetStyle(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTextCtrl_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxTextCtrl * _arg0; + long _arg1; + wxTextAttr * _arg2; + PyObject * _argo0 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","position","style", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxTextCtrl_GetStyle",_kwnames,&_argo0,&_arg1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetStyle. Expected _wxTextCtrl_p."); + return NULL; + } + } + if (_argo2) { + if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxTextAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTextCtrl_GetStyle. Expected _wxTextAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxTextCtrl_GetStyle(_arg0,_arg1,*_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxTextCtrl_XYToPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->XYToPosition(_swigarg0,_swigarg1)) static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -11211,6 +11732,36 @@ static PyObject *_wrap_wxSpinCtrl_SetValue(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxSpinCtrl_SetSelection(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetSelection(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxSpinCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSpinCtrl * _arg0; + long _arg1; + long _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","from","to", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxSpinCtrl_SetSelection",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSpinCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinCtrl_SetSelection. Expected _wxSpinCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSpinCtrl_SetSelection(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxToggleButtonTowxControl(void *ptr) { wxToggleButton *src; wxControl *dest; @@ -11548,6 +12099,7 @@ static PyMethodDef controlscMethods[] = { { "wxToggleButton_Create", (PyCFunction) _wrap_wxToggleButton_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreToggleButton", (PyCFunction) _wrap_new_wxPreToggleButton, METH_VARARGS | METH_KEYWORDS }, { "new_wxToggleButton", (PyCFunction) _wrap_new_wxToggleButton, METH_VARARGS | METH_KEYWORDS }, + { "wxSpinCtrl_SetSelection", (PyCFunction) _wrap_wxSpinCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS }, { "wxSpinCtrl_SetValue", (PyCFunction) _wrap_wxSpinCtrl_SetValue, METH_VARARGS | METH_KEYWORDS }, { "wxSpinCtrl_SetRange", (PyCFunction) _wrap_wxSpinCtrl_SetRange, METH_VARARGS | METH_KEYWORDS }, { "wxSpinCtrl_GetValue", (PyCFunction) _wrap_wxSpinCtrl_GetValue, METH_VARARGS | METH_KEYWORDS }, @@ -11650,6 +12202,7 @@ static PyMethodDef controlscMethods[] = { { "wxTextCtrl_ShowPosition", (PyCFunction) _wrap_wxTextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_PositionToXY", (PyCFunction) _wrap_wxTextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_XYToPosition", (PyCFunction) _wrap_wxTextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS }, + { "wxTextCtrl_GetStyle", (PyCFunction) _wrap_wxTextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_GetDefaultStyle", (PyCFunction) _wrap_wxTextCtrl_GetDefaultStyle, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_SetDefaultStyle", (PyCFunction) _wrap_wxTextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_SetStyle", (PyCFunction) _wrap_wxTextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS }, @@ -11678,15 +12231,31 @@ static PyMethodDef controlscMethods[] = { { "new_wxTextCtrl", (PyCFunction) _wrap_new_wxTextCtrl, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_Combine", (PyCFunction) _wrap_wxTextAttr_Combine, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_IsDefault", (PyCFunction) _wrap_wxTextAttr_IsDefault, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_GetFlags", (PyCFunction) _wrap_wxTextAttr_GetFlags, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_GetRightIndent", (PyCFunction) _wrap_wxTextAttr_GetRightIndent, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_GetLeftIndent", (PyCFunction) _wrap_wxTextAttr_GetLeftIndent, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_GetTabs", (PyCFunction) _wrap_wxTextAttr_GetTabs, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_GetAlignment", (PyCFunction) _wrap_wxTextAttr_GetAlignment, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_GetFont", (PyCFunction) _wrap_wxTextAttr_GetFont, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_GetBackgroundColour", (PyCFunction) _wrap_wxTextAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_GetTextColour", (PyCFunction) _wrap_wxTextAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_HasFlag", (PyCFunction) _wrap_wxTextAttr_HasFlag, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_HasRightIndent", (PyCFunction) _wrap_wxTextAttr_HasRightIndent, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_HasLeftIndent", (PyCFunction) _wrap_wxTextAttr_HasLeftIndent, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_HasTabs", (PyCFunction) _wrap_wxTextAttr_HasTabs, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_HasAlignment", (PyCFunction) _wrap_wxTextAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_HasFont", (PyCFunction) _wrap_wxTextAttr_HasFont, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_HasBackgroundColour", (PyCFunction) _wrap_wxTextAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_HasTextColour", (PyCFunction) _wrap_wxTextAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_SetFlags", (PyCFunction) _wrap_wxTextAttr_SetFlags, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_SetRightIndent", (PyCFunction) _wrap_wxTextAttr_SetRightIndent, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_SetLeftIndent", (PyCFunction) _wrap_wxTextAttr_SetLeftIndent, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_SetTabs", (PyCFunction) _wrap_wxTextAttr_SetTabs, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_SetAlignment", (PyCFunction) _wrap_wxTextAttr_SetAlignment, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_SetFont", (PyCFunction) _wrap_wxTextAttr_SetFont, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_SetBackgroundColour", (PyCFunction) _wrap_wxTextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxTextAttr_SetTextColour", (PyCFunction) _wrap_wxTextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxTextAttr_Init", (PyCFunction) _wrap_wxTextAttr_Init, METH_VARARGS | METH_KEYWORDS }, { "delete_wxTextAttr", (PyCFunction) _wrap_delete_wxTextAttr, METH_VARARGS | METH_KEYWORDS }, { "new_wxTextAttr", (PyCFunction) _wrap_new_wxTextAttr, METH_VARARGS | METH_KEYWORDS }, { "wxCheckListBox_HitTestXY", (PyCFunction) _wrap_wxCheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS }, @@ -12019,6 +12588,42 @@ SWIGEXPORT(void) initcontrolsc() { d = PyModule_GetDict(m); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxDefaultValidator",_wrap_wxDefaultValidator_get, _wrap_wxDefaultValidator_set); + PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL)); + PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL)); + PyDict_SetItemString(d,"wxTE_READONLY", PyInt_FromLong((long) wxTE_READONLY)); + PyDict_SetItemString(d,"wxTE_MULTILINE", PyInt_FromLong((long) wxTE_MULTILINE)); + PyDict_SetItemString(d,"wxTE_PROCESS_TAB", PyInt_FromLong((long) wxTE_PROCESS_TAB)); + PyDict_SetItemString(d,"wxTE_LEFT", PyInt_FromLong((long) wxTE_LEFT)); + PyDict_SetItemString(d,"wxTE_CENTER", PyInt_FromLong((long) wxTE_CENTER)); + PyDict_SetItemString(d,"wxTE_RIGHT", PyInt_FromLong((long) wxTE_RIGHT)); + PyDict_SetItemString(d,"wxTE_CENTRE", PyInt_FromLong((long) wxTE_CENTRE)); + PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH)); + PyDict_SetItemString(d,"wxTE_PROCESS_ENTER", PyInt_FromLong((long) wxTE_PROCESS_ENTER)); + PyDict_SetItemString(d,"wxTE_PASSWORD", PyInt_FromLong((long) wxTE_PASSWORD)); + PyDict_SetItemString(d,"wxTE_AUTO_URL", PyInt_FromLong((long) wxTE_AUTO_URL)); + PyDict_SetItemString(d,"wxTE_NOHIDESEL", PyInt_FromLong((long) wxTE_NOHIDESEL)); + PyDict_SetItemString(d,"wxTE_DONTWRAP", PyInt_FromLong((long) wxTE_DONTWRAP)); + PyDict_SetItemString(d,"wxTE_LINEWRAP", PyInt_FromLong((long) wxTE_LINEWRAP)); + PyDict_SetItemString(d,"wxTE_WORDWRAP", PyInt_FromLong((long) wxTE_WORDWRAP)); + PyDict_SetItemString(d,"wxTE_RICH2", PyInt_FromLong((long) wxTE_RICH2)); + PyDict_SetItemString(d,"wxTEXT_ATTR_TEXT_COLOUR", PyInt_FromLong((long) wxTEXT_ATTR_TEXT_COLOUR)); + PyDict_SetItemString(d,"wxTEXT_ATTR_BACKGROUND_COLOUR", PyInt_FromLong((long) wxTEXT_ATTR_BACKGROUND_COLOUR)); + PyDict_SetItemString(d,"wxTEXT_ATTR_FONT_FACE", PyInt_FromLong((long) wxTEXT_ATTR_FONT_FACE)); + PyDict_SetItemString(d,"wxTEXT_ATTR_FONT_SIZE", PyInt_FromLong((long) wxTEXT_ATTR_FONT_SIZE)); + PyDict_SetItemString(d,"wxTEXT_ATTR_FONT_WEIGHT", PyInt_FromLong((long) wxTEXT_ATTR_FONT_WEIGHT)); + PyDict_SetItemString(d,"wxTEXT_ATTR_FONT_ITALIC", PyInt_FromLong((long) wxTEXT_ATTR_FONT_ITALIC)); + PyDict_SetItemString(d,"wxTEXT_ATTR_FONT_UNDERLINE", PyInt_FromLong((long) wxTEXT_ATTR_FONT_UNDERLINE)); + PyDict_SetItemString(d,"wxTEXT_ATTR_FONT", PyInt_FromLong((long) wxTEXT_ATTR_FONT)); + PyDict_SetItemString(d,"wxTEXT_ATTR_ALIGNMENT", PyInt_FromLong((long) wxTEXT_ATTR_ALIGNMENT)); + PyDict_SetItemString(d,"wxTEXT_ATTR_LEFT_INDENT", PyInt_FromLong((long) wxTEXT_ATTR_LEFT_INDENT)); + PyDict_SetItemString(d,"wxTEXT_ATTR_RIGHT_INDENT", PyInt_FromLong((long) wxTEXT_ATTR_RIGHT_INDENT)); + PyDict_SetItemString(d,"wxTEXT_ATTR_TABS", PyInt_FromLong((long) wxTEXT_ATTR_TABS)); + PyDict_SetItemString(d,"wxTEXT_ALIGNMENT_DEFAULT", PyInt_FromLong((long) wxTEXT_ALIGNMENT_DEFAULT)); + PyDict_SetItemString(d,"wxTEXT_ALIGNMENT_LEFT", PyInt_FromLong((long) wxTEXT_ALIGNMENT_LEFT)); + PyDict_SetItemString(d,"wxTEXT_ALIGNMENT_CENTRE", PyInt_FromLong((long) wxTEXT_ALIGNMENT_CENTRE)); + PyDict_SetItemString(d,"wxTEXT_ALIGNMENT_CENTER", PyInt_FromLong((long) wxTEXT_ALIGNMENT_CENTER)); + PyDict_SetItemString(d,"wxTEXT_ALIGNMENT_RIGHT", PyInt_FromLong((long) wxTEXT_ALIGNMENT_RIGHT)); + PyDict_SetItemString(d,"wxTEXT_ALIGNMENT_JUSTIFIED", PyInt_FromLong((long) wxTEXT_ALIGNMENT_JUSTIFIED)); PyDict_SetItemString(d,"wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong((long) wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)); { int i; diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py index cbd8a3c0e6..61f799a140 100644 --- a/wxPython/src/msw/controls.py +++ b/wxPython/src/msw/controls.py @@ -18,29 +18,29 @@ class wxControlPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxControl_Create,(self,) + _args, _kwargs) + val = controlsc.wxControl_Create(self, *_args, **_kwargs) return val def Command(self, *_args, **_kwargs): - val = apply(controlsc.wxControl_Command,(self,) + _args, _kwargs) + val = controlsc.wxControl_Command(self, *_args, **_kwargs) return val def GetLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxControl_GetLabel,(self,) + _args, _kwargs) + val = controlsc.wxControl_GetLabel(self, *_args, **_kwargs) return val def SetLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxControl_SetLabel,(self,) + _args, _kwargs) + val = controlsc.wxControl_SetLabel(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxControl(wxControlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxControl,_args,_kwargs) + self.this = controlsc.new_wxControl(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreControl(*_args,**_kwargs): - val = wxControlPtr(apply(controlsc.new_wxPreControl,_args,_kwargs)) + val = wxControlPtr(controlsc.new_wxPreControl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -51,43 +51,43 @@ class wxControlWithItemsPtr(wxControlPtr): self.this = this self.thisown = 0 def Delete(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_Delete,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_Delete(self, *_args, **_kwargs) return val def GetCount(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_GetCount,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_GetCount(self, *_args, **_kwargs) return val def GetString(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_GetString,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_GetString(self, *_args, **_kwargs) return val def SetString(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_SetString,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_SetString(self, *_args, **_kwargs) return val def FindString(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_FindString,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_FindString(self, *_args, **_kwargs) return val def Select(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_Select,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_Select(self, *_args, **_kwargs) return val def GetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_GetSelection,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_GetSelection(self, *_args, **_kwargs) return val def GetStringSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_GetStringSelection,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_GetStringSelection(self, *_args, **_kwargs) return val def Append(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_Append,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_Append(self, *_args, **_kwargs) return val def GetClientData(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_GetClientData,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_GetClientData(self, *_args, **_kwargs) return val def SetClientData(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_SetClientData,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_SetClientData(self, *_args, **_kwargs) return val def AppendItems(self, *_args, **_kwargs): - val = apply(controlsc.wxControlWithItems_AppendItems,(self,) + _args, _kwargs) + val = controlsc.wxControlWithItems_AppendItems(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxControlWithItems instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) Number = GetCount class wxControlWithItems(wxControlWithItemsPtr): def __init__(self,this): @@ -101,35 +101,35 @@ class wxButtonPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxButton_Create,(self,) + _args, _kwargs) + val = controlsc.wxButton_Create(self, *_args, **_kwargs) return val def SetDefault(self, *_args, **_kwargs): - val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs) + val = controlsc.wxButton_SetDefault(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(controlsc.wxButton_SetBackgroundColour,(self,) + _args, _kwargs) + val = controlsc.wxButton_SetBackgroundColour(self, *_args, **_kwargs) return val def SetForegroundColour(self, *_args, **_kwargs): - val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs) + val = controlsc.wxButton_SetForegroundColour(self, *_args, **_kwargs) return val def SetImageLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxButton_SetImageLabel,(self,) + _args, _kwargs) + val = controlsc.wxButton_SetImageLabel(self, *_args, **_kwargs) return val def SetImageMargins(self, *_args, **_kwargs): - val = apply(controlsc.wxButton_SetImageMargins,(self,) + _args, _kwargs) + val = controlsc.wxButton_SetImageMargins(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxButton(wxButtonPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxButton,_args,_kwargs) + self.this = controlsc.new_wxButton(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreButton(*_args,**_kwargs): - val = wxButtonPtr(apply(controlsc.new_wxPreButton,_args,_kwargs)) + val = wxButtonPtr(controlsc.new_wxPreButton(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -140,57 +140,57 @@ class wxBitmapButtonPtr(wxButtonPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_Create,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_Create(self, *_args, **_kwargs) return val def GetBitmapLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_GetBitmapLabel,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_GetBitmapLabel(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def GetBitmapDisabled(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_GetBitmapDisabled,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_GetBitmapDisabled(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def GetBitmapFocus(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_GetBitmapFocus,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_GetBitmapFocus(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def GetBitmapSelected(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_GetBitmapSelected,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_GetBitmapSelected(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def SetBitmapDisabled(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_SetBitmapDisabled,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_SetBitmapDisabled(self, *_args, **_kwargs) return val def SetBitmapFocus(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_SetBitmapFocus,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_SetBitmapFocus(self, *_args, **_kwargs) return val def SetBitmapSelected(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_SetBitmapSelected,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_SetBitmapSelected(self, *_args, **_kwargs) return val def SetBitmapLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_SetBitmapLabel,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_SetBitmapLabel(self, *_args, **_kwargs) return val def SetMargins(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_SetMargins,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_SetMargins(self, *_args, **_kwargs) return val def GetMarginX(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_GetMarginX,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_GetMarginX(self, *_args, **_kwargs) return val def GetMarginY(self, *_args, **_kwargs): - val = apply(controlsc.wxBitmapButton_GetMarginY,(self,) + _args, _kwargs) + val = controlsc.wxBitmapButton_GetMarginY(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBitmapButton(wxBitmapButtonPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs) + self.this = controlsc.new_wxBitmapButton(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreBitmapButton(*_args,**_kwargs): - val = wxBitmapButtonPtr(apply(controlsc.new_wxPreBitmapButton,_args,_kwargs)) + val = wxBitmapButtonPtr(controlsc.new_wxPreBitmapButton(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -201,29 +201,29 @@ class wxCheckBoxPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckBox_Create,(self,) + _args, _kwargs) + val = controlsc.wxCheckBox_Create(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxCheckBox_GetValue(self, *_args, **_kwargs) return val def IsChecked(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckBox_IsChecked,(self,) + _args, _kwargs) + val = controlsc.wxCheckBox_IsChecked(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckBox_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxCheckBox_SetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCheckBox(wxCheckBoxPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs) + self.this = controlsc.new_wxCheckBox(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreCheckBox(*_args,**_kwargs): - val = wxCheckBoxPtr(apply(controlsc.new_wxPreCheckBox,_args,_kwargs)) + val = wxCheckBoxPtr(controlsc.new_wxPreCheckBox(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -234,41 +234,41 @@ class wxChoicePtr(wxControlWithItemsPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxChoice_Create,(self,) + _args, _kwargs) + val = controlsc.wxChoice_Create(self, *_args, **_kwargs) return val def Clear(self, *_args, **_kwargs): - val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs) + val = controlsc.wxChoice_Clear(self, *_args, **_kwargs) return val def GetColumns(self, *_args, **_kwargs): - val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs) + val = controlsc.wxChoice_GetColumns(self, *_args, **_kwargs) return val def SetColumns(self, *_args, **_kwargs): - val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs) + val = controlsc.wxChoice_SetColumns(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxChoice_SetSelection,(self,) + _args, _kwargs) + val = controlsc.wxChoice_SetSelection(self, *_args, **_kwargs) return val def SetStringSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs) + val = controlsc.wxChoice_SetStringSelection(self, *_args, **_kwargs) return val def SetString(self, *_args, **_kwargs): - val = apply(controlsc.wxChoice_SetString,(self,) + _args, _kwargs) + val = controlsc.wxChoice_SetString(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxChoice instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) Select = SetSelection class wxChoice(wxChoicePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxChoice,_args,_kwargs) + self.this = controlsc.new_wxChoice(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreChoice(*_args,**_kwargs): - val = wxChoicePtr(apply(controlsc.new_wxPreChoice,_args,_kwargs)) + val = wxChoicePtr(controlsc.new_wxPreChoice(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -279,62 +279,62 @@ class wxComboBoxPtr(wxChoicePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_Create,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_Create(self, *_args, **_kwargs) return val def Copy(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_Copy(self, *_args, **_kwargs) return val def Cut(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_Cut(self, *_args, **_kwargs) return val def GetInsertionPoint(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_GetInsertionPoint(self, *_args, **_kwargs) return val def GetLastPosition(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_GetLastPosition(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_GetValue(self, *_args, **_kwargs) return val def Paste(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_Paste(self, *_args, **_kwargs) return val def Replace(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_Replace,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_Replace(self, *_args, **_kwargs) return val def Remove(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_Remove,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_Remove(self, *_args, **_kwargs) return val def SetInsertionPoint(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_SetInsertionPoint,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_SetInsertionPoint(self, *_args, **_kwargs) return val def SetInsertionPointEnd(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_SetInsertionPointEnd,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_SetInsertionPointEnd(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_SetSelection,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_SetSelection(self, *_args, **_kwargs) return val def SetMark(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_SetMark,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_SetMark(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_SetValue(self, *_args, **_kwargs) return val def SetEditable(self, *_args, **_kwargs): - val = apply(controlsc.wxComboBox_SetEditable,(self,) + _args, _kwargs) + val = controlsc.wxComboBox_SetEditable(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxComboBox(wxComboBoxPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxComboBox,_args,_kwargs) + self.this = controlsc.new_wxComboBox(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreComboBox(*_args,**_kwargs): - val = wxComboBoxPtr(apply(controlsc.new_wxPreComboBox,_args,_kwargs)) + val = wxComboBoxPtr(controlsc.new_wxPreComboBox(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -345,44 +345,44 @@ class wxGaugePtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_Create,(self,) + _args, _kwargs) + val = controlsc.wxGauge_Create(self, *_args, **_kwargs) return val def GetBezelFace(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_GetBezelFace,(self,) + _args, _kwargs) + val = controlsc.wxGauge_GetBezelFace(self, *_args, **_kwargs) return val def GetRange(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_GetRange,(self,) + _args, _kwargs) + val = controlsc.wxGauge_GetRange(self, *_args, **_kwargs) return val def GetShadowWidth(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_GetShadowWidth,(self,) + _args, _kwargs) + val = controlsc.wxGauge_GetShadowWidth(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxGauge_GetValue(self, *_args, **_kwargs) return val def SetBezelFace(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_SetBezelFace,(self,) + _args, _kwargs) + val = controlsc.wxGauge_SetBezelFace(self, *_args, **_kwargs) return val def SetRange(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_SetRange,(self,) + _args, _kwargs) + val = controlsc.wxGauge_SetRange(self, *_args, **_kwargs) return val def SetShadowWidth(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_SetShadowWidth,(self,) + _args, _kwargs) + val = controlsc.wxGauge_SetShadowWidth(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxGauge_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxGauge_SetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGauge instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGauge(wxGaugePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxGauge,_args,_kwargs) + self.this = controlsc.new_wxGauge(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreGauge(*_args,**_kwargs): - val = wxGaugePtr(apply(controlsc.new_wxPreGauge,_args,_kwargs)) + val = wxGaugePtr(controlsc.new_wxPreGauge(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -393,20 +393,20 @@ class wxStaticBoxPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticBox_Create,(self,) + _args, _kwargs) + val = controlsc.wxStaticBox_Create(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStaticBox(wxStaticBoxPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxStaticBox,_args,_kwargs) + self.this = controlsc.new_wxStaticBox(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreStaticBox(*_args,**_kwargs): - val = wxStaticBoxPtr(apply(controlsc.new_wxPreStaticBox,_args,_kwargs)) + val = wxStaticBoxPtr(controlsc.new_wxPreStaticBox(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -417,20 +417,20 @@ class wxStaticLinePtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticLine_Create,(self,) + _args, _kwargs) + val = controlsc.wxStaticLine_Create(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxStaticLine instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStaticLine(wxStaticLinePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxStaticLine,_args,_kwargs) + self.this = controlsc.new_wxStaticLine(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreStaticLine(*_args,**_kwargs): - val = wxStaticLinePtr(apply(controlsc.new_wxPreStaticLine,_args,_kwargs)) + val = wxStaticLinePtr(controlsc.new_wxPreStaticLine(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -441,26 +441,26 @@ class wxStaticTextPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticText_Create,(self,) + _args, _kwargs) + val = controlsc.wxStaticText_Create(self, *_args, **_kwargs) return val def GetLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticText_GetLabel,(self,) + _args, _kwargs) + val = controlsc.wxStaticText_GetLabel(self, *_args, **_kwargs) return val def SetLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticText_SetLabel,(self,) + _args, _kwargs) + val = controlsc.wxStaticText_SetLabel(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStaticText(wxStaticTextPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxStaticText,_args,_kwargs) + self.this = controlsc.new_wxStaticText(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreStaticText(*_args,**_kwargs): - val = wxStaticTextPtr(apply(controlsc.new_wxPreStaticText,_args,_kwargs)) + val = wxStaticTextPtr(controlsc.new_wxPreStaticText(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -471,56 +471,56 @@ class wxListBoxPtr(wxControlWithItemsPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_Create,(self,) + _args, _kwargs) + val = controlsc.wxListBox_Create(self, *_args, **_kwargs) return val def Clear(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs) + val = controlsc.wxListBox_Clear(self, *_args, **_kwargs) return val def Deselect(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs) + val = controlsc.wxListBox_Deselect(self, *_args, **_kwargs) return val def GetSelections(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs) + val = controlsc.wxListBox_GetSelections(self, *_args, **_kwargs) return val def InsertItems(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs) + val = controlsc.wxListBox_InsertItems(self, *_args, **_kwargs) return val def IsSelected(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs) + val = controlsc.wxListBox_IsSelected(self, *_args, **_kwargs) return val def Selected(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs) + val = controlsc.wxListBox_Selected(self, *_args, **_kwargs) return val def Set(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_Set,(self,) + _args, _kwargs) + val = controlsc.wxListBox_Set(self, *_args, **_kwargs) return val def SetFirstItem(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_SetFirstItem,(self,) + _args, _kwargs) + val = controlsc.wxListBox_SetFirstItem(self, *_args, **_kwargs) return val def SetFirstItemStr(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_SetFirstItemStr,(self,) + _args, _kwargs) + val = controlsc.wxListBox_SetFirstItemStr(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_SetSelection,(self,) + _args, _kwargs) + val = controlsc.wxListBox_SetSelection(self, *_args, **_kwargs) return val def SetString(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_SetString,(self,) + _args, _kwargs) + val = controlsc.wxListBox_SetString(self, *_args, **_kwargs) return val def SetStringSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxListBox_SetStringSelection,(self,) + _args, _kwargs) + val = controlsc.wxListBox_SetStringSelection(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxListBox(wxListBoxPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxListBox,_args,_kwargs) + self.this = controlsc.new_wxListBox(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreListBox(*_args,**_kwargs): - val = wxListBoxPtr(apply(controlsc.new_wxPreListBox,_args,_kwargs)) + val = wxListBoxPtr(controlsc.new_wxPreListBox(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -531,38 +531,38 @@ class wxCheckListBoxPtr(wxListBoxPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckListBox_Create,(self,) + _args, _kwargs) + val = controlsc.wxCheckListBox_Create(self, *_args, **_kwargs) return val def IsChecked(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckListBox_IsChecked,(self,) + _args, _kwargs) + val = controlsc.wxCheckListBox_IsChecked(self, *_args, **_kwargs) return val def Check(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckListBox_Check,(self,) + _args, _kwargs) + val = controlsc.wxCheckListBox_Check(self, *_args, **_kwargs) return val def InsertItems(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckListBox_InsertItems,(self,) + _args, _kwargs) + val = controlsc.wxCheckListBox_InsertItems(self, *_args, **_kwargs) return val def GetItemHeight(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckListBox_GetItemHeight,(self,) + _args, _kwargs) + val = controlsc.wxCheckListBox_GetItemHeight(self, *_args, **_kwargs) return val def HitTest(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckListBox_HitTest,(self,) + _args, _kwargs) + val = controlsc.wxCheckListBox_HitTest(self, *_args, **_kwargs) return val def HitTestXY(self, *_args, **_kwargs): - val = apply(controlsc.wxCheckListBox_HitTestXY,(self,) + _args, _kwargs) + val = controlsc.wxCheckListBox_HitTestXY(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCheckListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCheckListBox(wxCheckListBoxPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs) + self.this = controlsc.new_wxCheckListBox(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreCheckListBox(*_args,**_kwargs): - val = wxCheckListBoxPtr(apply(controlsc.new_wxPreCheckListBox,_args,_kwargs)) + val = wxCheckListBoxPtr(controlsc.new_wxPreCheckListBox(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -578,44 +578,92 @@ class wxTextAttrPtr : delfunc(self) except: pass + def Init(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_Init(self, *_args, **_kwargs) + return val def SetTextColour(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_SetTextColour(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_SetBackgroundColour,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_SetBackgroundColour(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_SetFont,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_SetFont(self, *_args, **_kwargs) + return val + def SetAlignment(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_SetAlignment(self, *_args, **_kwargs) + return val + def SetTabs(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_SetTabs(self, *_args, **_kwargs) + return val + def SetLeftIndent(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_SetLeftIndent(self, *_args, **_kwargs) + return val + def SetRightIndent(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_SetRightIndent(self, *_args, **_kwargs) + return val + def SetFlags(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_SetFlags(self, *_args, **_kwargs) return val def HasTextColour(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_HasTextColour,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_HasTextColour(self, *_args, **_kwargs) return val def HasBackgroundColour(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_HasBackgroundColour,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_HasBackgroundColour(self, *_args, **_kwargs) return val def HasFont(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_HasFont,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_HasFont(self, *_args, **_kwargs) + return val + def HasAlignment(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_HasAlignment(self, *_args, **_kwargs) + return val + def HasTabs(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_HasTabs(self, *_args, **_kwargs) + return val + def HasLeftIndent(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_HasLeftIndent(self, *_args, **_kwargs) + return val + def HasRightIndent(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_HasRightIndent(self, *_args, **_kwargs) + return val + def HasFlag(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_HasFlag(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_GetTextColour,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_GetBackgroundColour,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetFont(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_GetFont,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val + def GetAlignment(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_GetAlignment(self, *_args, **_kwargs) + return val + def GetTabs(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_GetTabs(self, *_args, **_kwargs) + return val + def GetLeftIndent(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_GetLeftIndent(self, *_args, **_kwargs) + return val + def GetRightIndent(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_GetRightIndent(self, *_args, **_kwargs) + return val + def GetFlags(self, *_args, **_kwargs): + val = controlsc.wxTextAttr_GetFlags(self, *_args, **_kwargs) + return val def IsDefault(self, *_args, **_kwargs): - val = apply(controlsc.wxTextAttr_IsDefault,(self,) + _args, _kwargs) + val = controlsc.wxTextAttr_IsDefault(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTextAttr(wxTextAttrPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxTextAttr,_args,_kwargs) + self.this = controlsc.new_wxTextAttr(*_args,**_kwargs) self.thisown = 1 @@ -626,162 +674,165 @@ class wxTextCtrlPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Create,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Create(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetValue(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetValue(self, *_args, **_kwargs) return val def GetRange(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetRange,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetRange(self, *_args, **_kwargs) return val def GetLineLength(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetLineLength(self, *_args, **_kwargs) return val def GetLineText(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetLineText,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetLineText(self, *_args, **_kwargs) return val def GetNumberOfLines(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetNumberOfLines,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetNumberOfLines(self, *_args, **_kwargs) return val def IsModified(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_IsModified,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_IsModified(self, *_args, **_kwargs) return val def IsEditable(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_IsEditable,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_IsEditable(self, *_args, **_kwargs) return val def GetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetSelection(self, *_args, **_kwargs) return val def GetStringSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetStringSelection,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetStringSelection(self, *_args, **_kwargs) return val def Clear(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Clear(self, *_args, **_kwargs) return val def Replace(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Replace,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Replace(self, *_args, **_kwargs) return val def Remove(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Remove,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Remove(self, *_args, **_kwargs) return val def LoadFile(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_LoadFile,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_LoadFile(self, *_args, **_kwargs) return val def SaveFile(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SaveFile(self, *_args, **_kwargs) return val def DiscardEdits(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_DiscardEdits,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_DiscardEdits(self, *_args, **_kwargs) return val def SetMaxLength(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetMaxLength,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetMaxLength(self, *_args, **_kwargs) return val def WriteText(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_WriteText,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_WriteText(self, *_args, **_kwargs) return val def AppendText(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_AppendText(self, *_args, **_kwargs) return val def EmulateKeyPress(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_EmulateKeyPress,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_EmulateKeyPress(self, *_args, **_kwargs) return val def SetStyle(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetStyle(self, *_args, **_kwargs) return val def SetDefaultStyle(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetDefaultStyle,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetDefaultStyle(self, *_args, **_kwargs) return val def GetDefaultStyle(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetDefaultStyle,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetDefaultStyle(self, *_args, **_kwargs) if val: val = wxTextAttrPtr(val) return val + def GetStyle(self, *_args, **_kwargs): + val = controlsc.wxTextCtrl_GetStyle(self, *_args, **_kwargs) + return val def XYToPosition(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_XYToPosition,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_XYToPosition(self, *_args, **_kwargs) return val def PositionToXY(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_PositionToXY,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_PositionToXY(self, *_args, **_kwargs) return val def ShowPosition(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_ShowPosition(self, *_args, **_kwargs) return val def Copy(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Copy,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Copy(self, *_args, **_kwargs) return val def Cut(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Cut,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Cut(self, *_args, **_kwargs) return val def Paste(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Paste,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Paste(self, *_args, **_kwargs) return val def CanCopy(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_CanCopy,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_CanCopy(self, *_args, **_kwargs) return val def CanCut(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_CanCut,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_CanCut(self, *_args, **_kwargs) return val def CanPaste(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_CanPaste,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_CanPaste(self, *_args, **_kwargs) return val def Undo(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Undo,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Undo(self, *_args, **_kwargs) return val def Redo(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_Redo,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_Redo(self, *_args, **_kwargs) return val def CanUndo(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_CanUndo,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_CanUndo(self, *_args, **_kwargs) return val def CanRedo(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_CanRedo,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_CanRedo(self, *_args, **_kwargs) return val def SetInsertionPoint(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetInsertionPoint(self, *_args, **_kwargs) return val def SetInsertionPointEnd(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetInsertionPointEnd(self, *_args, **_kwargs) return val def GetInsertionPoint(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetInsertionPoint,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetInsertionPoint(self, *_args, **_kwargs) return val def GetLastPosition(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetLastPosition,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetLastPosition(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetSelection(self, *_args, **_kwargs) return val def SelectAll(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SelectAll,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SelectAll(self, *_args, **_kwargs) return val def SetEditable(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_SetEditable(self, *_args, **_kwargs) return val def IsSingleLine(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_IsSingleLine,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_IsSingleLine(self, *_args, **_kwargs) return val def IsMultiLine(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_IsMultiLine,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_IsMultiLine(self, *_args, **_kwargs) return val def write(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_write(self, *_args, **_kwargs) return val def GetString(self, *_args, **_kwargs): - val = apply(controlsc.wxTextCtrl_GetString,(self,) + _args, _kwargs) + val = controlsc.wxTextCtrl_GetString(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTextCtrl(wxTextCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs) + self.this = controlsc.new_wxTextCtrl(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreTextCtrl(*_args,**_kwargs): - val = wxTextCtrlPtr(apply(controlsc.new_wxPreTextCtrl,_args,_kwargs)) + val = wxTextCtrlPtr(controlsc.new_wxPreTextCtrl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -792,44 +843,44 @@ class wxScrollBarPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_Create,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_Create(self, *_args, **_kwargs) return val def GetRange(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_GetRange,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_GetRange(self, *_args, **_kwargs) return val def GetPageSize(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_GetPageSize,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_GetPageSize(self, *_args, **_kwargs) return val def GetThumbPosition(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_GetThumbPosition,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_GetThumbPosition(self, *_args, **_kwargs) return val def GetThumbSize(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_GetThumbSize,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_GetThumbSize(self, *_args, **_kwargs) return val def GetThumbLength(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_GetThumbLength,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_GetThumbLength(self, *_args, **_kwargs) return val def IsVertical(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_IsVertical,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_IsVertical(self, *_args, **_kwargs) return val def SetThumbPosition(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_SetThumbPosition(self, *_args, **_kwargs) return val def SetScrollbar(self, *_args, **_kwargs): - val = apply(controlsc.wxScrollBar_SetScrollbar,(self,) + _args, _kwargs) + val = controlsc.wxScrollBar_SetScrollbar(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxScrollBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxScrollBar(wxScrollBarPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs) + self.this = controlsc.new_wxScrollBar(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreScrollBar(*_args,**_kwargs): - val = wxScrollBarPtr(apply(controlsc.new_wxPreScrollBar,_args,_kwargs)) + val = wxScrollBarPtr(controlsc.new_wxPreScrollBar(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -840,35 +891,35 @@ class wxSpinButtonPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinButton_Create,(self,) + _args, _kwargs) + val = controlsc.wxSpinButton_Create(self, *_args, **_kwargs) return val def GetMax(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinButton_GetMax,(self,) + _args, _kwargs) + val = controlsc.wxSpinButton_GetMax(self, *_args, **_kwargs) return val def GetMin(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinButton_GetMin,(self,) + _args, _kwargs) + val = controlsc.wxSpinButton_GetMin(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinButton_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxSpinButton_GetValue(self, *_args, **_kwargs) return val def SetRange(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinButton_SetRange,(self,) + _args, _kwargs) + val = controlsc.wxSpinButton_SetRange(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinButton_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxSpinButton_SetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSpinButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSpinButton(wxSpinButtonPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxSpinButton,_args,_kwargs) + self.this = controlsc.new_wxSpinButton(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreSpinButton(*_args,**_kwargs): - val = wxSpinButtonPtr(apply(controlsc.new_wxPreSpinButton,_args,_kwargs)) + val = wxSpinButtonPtr(controlsc.new_wxPreSpinButton(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -879,30 +930,30 @@ class wxStaticBitmapPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticBitmap_Create,(self,) + _args, _kwargs) + val = controlsc.wxStaticBitmap_Create(self, *_args, **_kwargs) return val def GetBitmap(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs) + val = controlsc.wxStaticBitmap_GetBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def SetBitmap(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs) + val = controlsc.wxStaticBitmap_SetBitmap(self, *_args, **_kwargs) return val def SetIcon(self, *_args, **_kwargs): - val = apply(controlsc.wxStaticBitmap_SetIcon,(self,) + _args, _kwargs) + val = controlsc.wxStaticBitmap_SetIcon(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStaticBitmap(wxStaticBitmapPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs) + self.this = controlsc.new_wxStaticBitmap(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreStaticBitmap(*_args,**_kwargs): - val = wxStaticBitmapPtr(apply(controlsc.new_wxPreStaticBitmap,_args,_kwargs)) + val = wxStaticBitmapPtr(controlsc.new_wxPreStaticBitmap(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -913,55 +964,55 @@ class wxRadioBoxPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_Create,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_Create(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_Enable,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_Enable(self, *_args, **_kwargs) return val def EnableItem(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_EnableItem,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_EnableItem(self, *_args, **_kwargs) return val def FindString(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_FindString(self, *_args, **_kwargs) return val def GetString(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_GetString(self, *_args, **_kwargs) return val def SetString(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_SetString,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_SetString(self, *_args, **_kwargs) return val def GetColumnCount(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_GetColumnCount,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_GetColumnCount(self, *_args, **_kwargs) return val def GetRowCount(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_GetRowCount,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_GetRowCount(self, *_args, **_kwargs) return val def GetNextItem(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_GetNextItem,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_GetNextItem(self, *_args, **_kwargs) return val def GetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_GetSelection(self, *_args, **_kwargs) return val def GetStringSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_GetStringSelection(self, *_args, **_kwargs) return val def GetCount(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_GetCount,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_GetCount(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_SetSelection(self, *_args, **_kwargs) return val def SetStringSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_SetStringSelection,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_SetStringSelection(self, *_args, **_kwargs) return val def Show(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_Show,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_Show(self, *_args, **_kwargs) return val def ShowItem(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioBox_ShowItem,(self,) + _args, _kwargs) + val = controlsc.wxRadioBox_ShowItem(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) GetItemLabel = GetString SetItemLabel = SetString @@ -969,14 +1020,14 @@ class wxRadioBoxPtr(wxControlPtr): Number = GetCount class wxRadioBox(wxRadioBoxPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs) + self.this = controlsc.new_wxRadioBox(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreRadioBox(*_args,**_kwargs): - val = wxRadioBoxPtr(apply(controlsc.new_wxPreRadioBox,_args,_kwargs)) + val = wxRadioBoxPtr(controlsc.new_wxPreRadioBox(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -987,26 +1038,26 @@ class wxRadioButtonPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioButton_Create,(self,) + _args, _kwargs) + val = controlsc.wxRadioButton_Create(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioButton_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxRadioButton_GetValue(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxRadioButton_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxRadioButton_SetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxRadioButton(wxRadioButtonPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs) + self.this = controlsc.new_wxRadioButton(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreRadioButton(*_args,**_kwargs): - val = wxRadioButtonPtr(apply(controlsc.new_wxPreRadioButton,_args,_kwargs)) + val = wxRadioButtonPtr(controlsc.new_wxPreRadioButton(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -1017,77 +1068,77 @@ class wxSliderPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_Create,(self,) + _args, _kwargs) + val = controlsc.wxSlider_Create(self, *_args, **_kwargs) return val def ClearSel(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_ClearSel,(self,) + _args, _kwargs) + val = controlsc.wxSlider_ClearSel(self, *_args, **_kwargs) return val def ClearTicks(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_ClearTicks,(self,) + _args, _kwargs) + val = controlsc.wxSlider_ClearTicks(self, *_args, **_kwargs) return val def GetLineSize(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetLineSize,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetLineSize(self, *_args, **_kwargs) return val def GetMax(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetMax,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetMax(self, *_args, **_kwargs) return val def GetMin(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetMin,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetMin(self, *_args, **_kwargs) return val def GetPageSize(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetPageSize,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetPageSize(self, *_args, **_kwargs) return val def GetSelEnd(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetSelEnd,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetSelEnd(self, *_args, **_kwargs) return val def GetSelStart(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetSelStart,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetSelStart(self, *_args, **_kwargs) return val def GetThumbLength(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetThumbLength,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetThumbLength(self, *_args, **_kwargs) return val def GetTickFreq(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetTickFreq,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetTickFreq(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxSlider_GetValue(self, *_args, **_kwargs) return val def SetRange(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetRange,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetRange(self, *_args, **_kwargs) return val def SetTickFreq(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetTickFreq,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetTickFreq(self, *_args, **_kwargs) return val def SetLineSize(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetLineSize,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetLineSize(self, *_args, **_kwargs) return val def SetPageSize(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetPageSize,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetPageSize(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetSelection,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetSelection(self, *_args, **_kwargs) return val def SetThumbLength(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetThumbLength,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetThumbLength(self, *_args, **_kwargs) return val def SetTick(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetTick,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetTick(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxSlider_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxSlider_SetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSlider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSlider(wxSliderPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxSlider,_args,_kwargs) + self.this = controlsc.new_wxSlider(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreSlider(*_args,**_kwargs): - val = wxSliderPtr(apply(controlsc.new_wxPreSlider,_args,_kwargs)) + val = wxSliderPtr(controlsc.new_wxPreSlider(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -1098,35 +1149,38 @@ class wxSpinCtrlPtr(wxSpinButtonPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinCtrl_Create,(self,) + _args, _kwargs) + val = controlsc.wxSpinCtrl_Create(self, *_args, **_kwargs) return val def GetMax(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinCtrl_GetMax,(self,) + _args, _kwargs) + val = controlsc.wxSpinCtrl_GetMax(self, *_args, **_kwargs) return val def GetMin(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinCtrl_GetMin,(self,) + _args, _kwargs) + val = controlsc.wxSpinCtrl_GetMin(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinCtrl_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxSpinCtrl_GetValue(self, *_args, **_kwargs) return val def SetRange(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinCtrl_SetRange,(self,) + _args, _kwargs) + val = controlsc.wxSpinCtrl_SetRange(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxSpinCtrl_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxSpinCtrl_SetValue(self, *_args, **_kwargs) + return val + def SetSelection(self, *_args, **_kwargs): + val = controlsc.wxSpinCtrl_SetSelection(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSpinCtrl(wxSpinCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxSpinCtrl,_args,_kwargs) + self.this = controlsc.new_wxSpinCtrl(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreSpinCtrl(*_args,**_kwargs): - val = wxSpinCtrlPtr(apply(controlsc.new_wxPreSpinCtrl,_args,_kwargs)) + val = wxSpinCtrlPtr(controlsc.new_wxPreSpinCtrl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -1137,29 +1191,29 @@ class wxToggleButtonPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controlsc.wxToggleButton_Create,(self,) + _args, _kwargs) + val = controlsc.wxToggleButton_Create(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxToggleButton_SetValue,(self,) + _args, _kwargs) + val = controlsc.wxToggleButton_SetValue(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(controlsc.wxToggleButton_GetValue,(self,) + _args, _kwargs) + val = controlsc.wxToggleButton_GetValue(self, *_args, **_kwargs) return val def SetLabel(self, *_args, **_kwargs): - val = apply(controlsc.wxToggleButton_SetLabel,(self,) + _args, _kwargs) + val = controlsc.wxToggleButton_SetLabel(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxToggleButton(wxToggleButtonPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controlsc.new_wxToggleButton,_args,_kwargs) + self.this = controlsc.new_wxToggleButton(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreToggleButton(*_args,**_kwargs): - val = wxToggleButtonPtr(apply(controlsc.new_wxPreToggleButton,_args,_kwargs)) + val = wxToggleButtonPtr(controlsc.new_wxPreToggleButton(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -1170,12 +1224,12 @@ def wxPreToggleButton(*_args,**_kwargs): #-------------- FUNCTION WRAPPERS ------------------ def wxButton_GetDefaultSize(*_args, **_kwargs): - val = apply(controlsc.wxButton_GetDefaultSize,_args,_kwargs) + val = controlsc.wxButton_GetDefaultSize(*_args,**_kwargs) if val: val = wxSizePtr(val); val.thisown = 1 return val def wxTextAttr_Combine(*_args, **_kwargs): - val = apply(controlsc.wxTextAttr_Combine,_args,_kwargs) + val = controlsc.wxTextAttr_Combine(*_args,**_kwargs) if val: val = wxTextAttrPtr(val); val.thisown = 1 return val @@ -1185,4 +1239,40 @@ def wxTextAttr_Combine(*_args, **_kwargs): cvar = controlsc.cvar wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator) +wxTE_NO_VSCROLL = controlsc.wxTE_NO_VSCROLL +wxTE_AUTO_SCROLL = controlsc.wxTE_AUTO_SCROLL +wxTE_READONLY = controlsc.wxTE_READONLY +wxTE_MULTILINE = controlsc.wxTE_MULTILINE +wxTE_PROCESS_TAB = controlsc.wxTE_PROCESS_TAB +wxTE_LEFT = controlsc.wxTE_LEFT +wxTE_CENTER = controlsc.wxTE_CENTER +wxTE_RIGHT = controlsc.wxTE_RIGHT +wxTE_CENTRE = controlsc.wxTE_CENTRE +wxTE_RICH = controlsc.wxTE_RICH +wxTE_PROCESS_ENTER = controlsc.wxTE_PROCESS_ENTER +wxTE_PASSWORD = controlsc.wxTE_PASSWORD +wxTE_AUTO_URL = controlsc.wxTE_AUTO_URL +wxTE_NOHIDESEL = controlsc.wxTE_NOHIDESEL +wxTE_DONTWRAP = controlsc.wxTE_DONTWRAP +wxTE_LINEWRAP = controlsc.wxTE_LINEWRAP +wxTE_WORDWRAP = controlsc.wxTE_WORDWRAP +wxTE_RICH2 = controlsc.wxTE_RICH2 +wxTEXT_ATTR_TEXT_COLOUR = controlsc.wxTEXT_ATTR_TEXT_COLOUR +wxTEXT_ATTR_BACKGROUND_COLOUR = controlsc.wxTEXT_ATTR_BACKGROUND_COLOUR +wxTEXT_ATTR_FONT_FACE = controlsc.wxTEXT_ATTR_FONT_FACE +wxTEXT_ATTR_FONT_SIZE = controlsc.wxTEXT_ATTR_FONT_SIZE +wxTEXT_ATTR_FONT_WEIGHT = controlsc.wxTEXT_ATTR_FONT_WEIGHT +wxTEXT_ATTR_FONT_ITALIC = controlsc.wxTEXT_ATTR_FONT_ITALIC +wxTEXT_ATTR_FONT_UNDERLINE = controlsc.wxTEXT_ATTR_FONT_UNDERLINE +wxTEXT_ATTR_FONT = controlsc.wxTEXT_ATTR_FONT +wxTEXT_ATTR_ALIGNMENT = controlsc.wxTEXT_ATTR_ALIGNMENT +wxTEXT_ATTR_LEFT_INDENT = controlsc.wxTEXT_ATTR_LEFT_INDENT +wxTEXT_ATTR_RIGHT_INDENT = controlsc.wxTEXT_ATTR_RIGHT_INDENT +wxTEXT_ATTR_TABS = controlsc.wxTEXT_ATTR_TABS +wxTEXT_ALIGNMENT_DEFAULT = controlsc.wxTEXT_ALIGNMENT_DEFAULT +wxTEXT_ALIGNMENT_LEFT = controlsc.wxTEXT_ALIGNMENT_LEFT +wxTEXT_ALIGNMENT_CENTRE = controlsc.wxTEXT_ALIGNMENT_CENTRE +wxTEXT_ALIGNMENT_CENTER = controlsc.wxTEXT_ALIGNMENT_CENTER +wxTEXT_ALIGNMENT_RIGHT = controlsc.wxTEXT_ALIGNMENT_RIGHT +wxTEXT_ALIGNMENT_JUSTIFIED = controlsc.wxTEXT_ALIGNMENT_JUSTIFIED wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = controlsc.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp index 80d55244c6..0802230f15 100644 --- a/wxPython/src/msw/controls2.cpp +++ b/wxPython/src/msw/controls2.cpp @@ -63,6 +63,8 @@ extern PyObject *SWIG_newvarlink(void); #include #include +#include "pytree.h" + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -153,37 +155,6 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr); return retval; } - -class wxPyTreeItemData : public wxTreeItemData { -public: - wxPyTreeItemData(PyObject* obj = NULL) { - if (obj == NULL) - obj = Py_None; - Py_INCREF(obj); - m_obj = obj; - } - - ~wxPyTreeItemData() { - wxPyBeginBlockThreads(); - Py_DECREF(m_obj); - wxPyEndBlockThreads(); - } - - PyObject* GetData() { - Py_INCREF(m_obj); - return m_obj; - } - - void SetData(PyObject* obj) { - wxPyBeginBlockThreads(); - Py_DECREF(m_obj); - wxPyEndBlockThreads(); - m_obj = obj; - Py_INCREF(obj); - } - - PyObject* m_obj; -}; // C++ version of Python aware wxTreeCtrl class wxPyTreeCtrl : public wxTreeCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl); @@ -5964,14 +5935,6 @@ static PyObject *_wrap_wxTreeItemId___cmp__(PyObject *self, PyObject *args, PyOb return _resultobj; } -static void *SwigwxPyTreeItemDataTowxObject(void *ptr) { - wxPyTreeItemData *src; - wxObject *dest; - src = (wxPyTreeItemData *) ptr; - dest = (wxObject *) src; - return (void *) dest; -} - #define new_wxTreeItemData(_swigarg0) (new wxPyTreeItemData(_swigarg0)) static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6229,6 +6192,42 @@ static PyObject *_wrap_wxTreeEvent_GetItem(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxTreeEvent_SetItem(_swigobj,_swigarg0) (_swigobj->SetItem(_swigarg0)) +static PyObject *_wrap_wxTreeEvent_SetItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTreeEvent * _arg0; + wxTreeItemId * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","item", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeEvent_SetItem",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_SetItem. Expected _wxTreeEvent_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeEvent_SetItem. Expected _wxTreeItemId_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTreeEvent_SetItem(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxTreeEvent_GetOldItem(_swigobj) (_swigobj->GetOldItem()) static PyObject *_wrap_wxTreeEvent_GetOldItem(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6259,6 +6258,42 @@ static PyObject *_wrap_wxTreeEvent_GetOldItem(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxTreeEvent_SetOldItem(_swigobj,_swigarg0) (_swigobj->SetOldItem(_swigarg0)) +static PyObject *_wrap_wxTreeEvent_SetOldItem(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTreeEvent * _arg0; + wxTreeItemId * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","item", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeEvent_SetOldItem",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_SetOldItem. Expected _wxTreeEvent_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeEvent_SetOldItem. Expected _wxTreeItemId_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTreeEvent_SetOldItem(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxTreeEvent_GetPoint(_swigobj) (_swigobj->GetPoint()) static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6289,6 +6324,42 @@ static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args, PyOb return _resultobj; } +#define wxTreeEvent_SetPoint(_swigobj,_swigarg0) (_swigobj->SetPoint(_swigarg0)) +static PyObject *_wrap_wxTreeEvent_SetPoint(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTreeEvent * _arg0; + wxPoint * _arg1; + PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeEvent_SetPoint",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_SetPoint. Expected _wxTreeEvent_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTreeEvent_SetPoint(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxTreeEvent_GetKeyEvent(_swigobj) (_swigobj->GetKeyEvent()) static PyObject *_wrap_wxTreeEvent_GetKeyEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6353,6 +6424,42 @@ static PyObject *_wrap_wxTreeEvent_GetKeyCode(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxTreeEvent_SetKeyEvent(_swigobj,_swigarg0) (_swigobj->SetKeyEvent(_swigarg0)) +static PyObject *_wrap_wxTreeEvent_SetKeyEvent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTreeEvent * _arg0; + wxKeyEvent * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","evt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeEvent_SetKeyEvent",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_SetKeyEvent. Expected _wxTreeEvent_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxKeyEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeEvent_SetKeyEvent. Expected _wxKeyEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTreeEvent_SetKeyEvent(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxTreeEvent_GetLabel(_swigobj) (_swigobj->GetLabel()) static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6388,6 +6495,45 @@ static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args, PyOb return _resultobj; } +#define wxTreeEvent_SetLabel(_swigobj,_swigarg0) (_swigobj->SetLabel(_swigarg0)) +static PyObject *_wrap_wxTreeEvent_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTreeEvent * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","label", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeEvent_SetLabel",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_SetLabel. Expected _wxTreeEvent_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTreeEvent_SetLabel(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxTreeEvent_IsEditCancelled(_swigobj) (_swigobj->IsEditCancelled()) static PyObject *_wrap_wxTreeEvent_IsEditCancelled(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6416,6 +6562,37 @@ static PyObject *_wrap_wxTreeEvent_IsEditCancelled(PyObject *self, PyObject *arg return _resultobj; } +#define wxTreeEvent_SetEditCanceled(_swigobj,_swigarg0) (_swigobj->SetEditCanceled(_swigarg0)) +static PyObject *_wrap_wxTreeEvent_SetEditCanceled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTreeEvent * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","editCancelled", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxTreeEvent_SetEditCanceled",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_SetEditCanceled. Expected _wxTreeEvent_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTreeEvent_SetEditCanceled(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxPyTreeCtrlTowxControl(void *ptr) { wxPyTreeCtrl *src; wxControl *dest; @@ -6456,7 +6633,7 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args, PyObject * wxWindowID _arg1 = (wxWindowID ) -1; wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; wxSize * _arg3 = (wxSize *) &wxDefaultSize; - long _arg4 = (long ) (wxTR_HAS_BUTTONS)|(wxTR_LINES_AT_ROOT); + long _arg4 = (long ) (wxTR_DEFAULT_STYLE); wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator; wxString * _arg6 = (wxString *) &wxPy_TreeCtrlNameStr; PyObject * _argo0 = 0; @@ -6558,7 +6735,7 @@ static PyObject *_wrap_wxTreeCtrl_Create(PyObject *self, PyObject *args, PyObjec wxWindowID _arg2 = (wxWindowID ) -1; wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) (wxTR_HAS_BUTTONS)|(wxTR_LINES_AT_ROOT); + long _arg5 = (long ) (wxTR_DEFAULT_STYLE); wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator; wxString * _arg7 = (wxString *) &wxPy_TreeCtrlNameStr; PyObject * _argo0 = 0; @@ -9383,7 +9560,7 @@ static PyObject * wxPyTreeCtrl_GetBoundingRect(wxPyTreeCtrl *self,const wxTreeIt if (self->GetBoundingRect(item, rect, textOnly)) { wxPyBeginBlockThreads(); wxRect* r = new wxRect(rect); - PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect")); + PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1); wxPyEndBlockThreads(); return val; } @@ -10620,6 +10797,34 @@ static PyObject *_wrap_wxGenericDirCtrl_GetFilterListCtrl(PyObject *self, PyObje return _resultobj; } +#define wxGenericDirCtrl_ReCreateTree(_swigobj) (_swigobj->ReCreateTree()) +static PyObject *_wrap_wxGenericDirCtrl_ReCreateTree(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGenericDirCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGenericDirCtrl_ReCreateTree",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGenericDirCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGenericDirCtrl_ReCreateTree. Expected _wxGenericDirCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGenericDirCtrl_ReCreateTree(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxDirFilterListCtrlTowxChoice(void *ptr) { wxDirFilterListCtrl *src; wxChoice *dest; @@ -10846,11 +11051,149 @@ static PyObject *_wrap_wxDirFilterListCtrl_FillFilterList(PyObject *self, PyObje return _resultobj; } +#define new_wxFileIconsTable() (new wxFileIconsTable()) +static PyObject *_wrap_new_wxFileIconsTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFileIconsTable * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxFileIconsTable",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxFileIconsTable *)new_wxFileIconsTable(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxFileIconsTable_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxFileIconsTable(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxFileIconsTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFileIconsTable * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxFileIconsTable",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileIconsTable_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxFileIconsTable. Expected _wxFileIconsTable_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxFileIconsTable(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFileIconsTable_GetIconID(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetIconID(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxFileIconsTable_GetIconID(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxFileIconsTable * _arg0; + wxString * _arg1; + wxString * _arg2 = (wxString *) &wxEmptyString; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","extension","mime", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxFileIconsTable_GetIconID",_kwnames,&_argo0,&_obj1,&_obj2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileIconsTable_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileIconsTable_GetIconID. Expected _wxFileIconsTable_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} + if (_obj2) +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxFileIconsTable_GetIconID(_arg0,*_arg1,*_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj1) + delete _arg1; +} +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + +#define wxFileIconsTable_GetSmallImageList(_swigobj) (_swigobj->GetSmallImageList()) +static PyObject *_wrap_wxFileIconsTable_GetSmallImageList(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxImageList * _result; + wxFileIconsTable * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileIconsTable_GetSmallImageList",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileIconsTable_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileIconsTable_GetSmallImageList. Expected _wxFileIconsTable_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxImageList *)wxFileIconsTable_GetSmallImageList(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + static PyMethodDef controls2cMethods[] = { + { "wxFileIconsTable_GetSmallImageList", (PyCFunction) _wrap_wxFileIconsTable_GetSmallImageList, METH_VARARGS | METH_KEYWORDS }, + { "wxFileIconsTable_GetIconID", (PyCFunction) _wrap_wxFileIconsTable_GetIconID, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxFileIconsTable", (PyCFunction) _wrap_delete_wxFileIconsTable, METH_VARARGS | METH_KEYWORDS }, + { "new_wxFileIconsTable", (PyCFunction) _wrap_new_wxFileIconsTable, METH_VARARGS | METH_KEYWORDS }, { "wxDirFilterListCtrl_FillFilterList", (PyCFunction) _wrap_wxDirFilterListCtrl_FillFilterList, METH_VARARGS | METH_KEYWORDS }, { "wxDirFilterListCtrl_Create", (PyCFunction) _wrap_wxDirFilterListCtrl_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreDirFilterListCtrl", (PyCFunction) _wrap_new_wxPreDirFilterListCtrl, METH_VARARGS | METH_KEYWORDS }, { "new_wxDirFilterListCtrl", (PyCFunction) _wrap_new_wxDirFilterListCtrl, METH_VARARGS | METH_KEYWORDS }, + { "wxGenericDirCtrl_ReCreateTree", (PyCFunction) _wrap_wxGenericDirCtrl_ReCreateTree, METH_VARARGS | METH_KEYWORDS }, { "wxGenericDirCtrl_GetFilterListCtrl", (PyCFunction) _wrap_wxGenericDirCtrl_GetFilterListCtrl, METH_VARARGS | METH_KEYWORDS }, { "wxGenericDirCtrl_GetTreeCtrl", (PyCFunction) _wrap_wxGenericDirCtrl_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS }, { "wxGenericDirCtrl_GetRootId", (PyCFunction) _wrap_wxGenericDirCtrl_GetRootId, METH_VARARGS | METH_KEYWORDS }, @@ -10956,12 +11299,18 @@ static PyMethodDef controls2cMethods[] = { { "wxTreeCtrl_Create", (PyCFunction) _wrap_wxTreeCtrl_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreTreeCtrl", (PyCFunction) _wrap_new_wxPreTreeCtrl, METH_VARARGS | METH_KEYWORDS }, { "new_wxTreeCtrl", (PyCFunction) _wrap_new_wxTreeCtrl, METH_VARARGS | METH_KEYWORDS }, + { "wxTreeEvent_SetEditCanceled", (PyCFunction) _wrap_wxTreeEvent_SetEditCanceled, METH_VARARGS | METH_KEYWORDS }, { "wxTreeEvent_IsEditCancelled", (PyCFunction) _wrap_wxTreeEvent_IsEditCancelled, METH_VARARGS | METH_KEYWORDS }, + { "wxTreeEvent_SetLabel", (PyCFunction) _wrap_wxTreeEvent_SetLabel, METH_VARARGS | METH_KEYWORDS }, { "wxTreeEvent_GetLabel", (PyCFunction) _wrap_wxTreeEvent_GetLabel, METH_VARARGS | METH_KEYWORDS }, + { "wxTreeEvent_SetKeyEvent", (PyCFunction) _wrap_wxTreeEvent_SetKeyEvent, METH_VARARGS | METH_KEYWORDS }, { "wxTreeEvent_GetKeyCode", (PyCFunction) _wrap_wxTreeEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS }, { "wxTreeEvent_GetKeyEvent", (PyCFunction) _wrap_wxTreeEvent_GetKeyEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxTreeEvent_SetPoint", (PyCFunction) _wrap_wxTreeEvent_SetPoint, METH_VARARGS | METH_KEYWORDS }, { "wxTreeEvent_GetPoint", (PyCFunction) _wrap_wxTreeEvent_GetPoint, METH_VARARGS | METH_KEYWORDS }, + { "wxTreeEvent_SetOldItem", (PyCFunction) _wrap_wxTreeEvent_SetOldItem, METH_VARARGS | METH_KEYWORDS }, { "wxTreeEvent_GetOldItem", (PyCFunction) _wrap_wxTreeEvent_GetOldItem, METH_VARARGS | METH_KEYWORDS }, + { "wxTreeEvent_SetItem", (PyCFunction) _wrap_wxTreeEvent_SetItem, METH_VARARGS | METH_KEYWORDS }, { "wxTreeEvent_GetItem", (PyCFunction) _wrap_wxTreeEvent_GetItem, METH_VARARGS | METH_KEYWORDS }, { "new_wxTreeEvent", (PyCFunction) _wrap_new_wxTreeEvent, METH_VARARGS | METH_KEYWORDS }, { "wxTreeItemData_SetId", (PyCFunction) _wrap_wxTreeItemData_SetId, METH_VARARGS | METH_KEYWORDS }, @@ -11210,7 +11559,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxObject","_wxDirItemData",SwigwxDirItemDataTowxObject}, { "_wxObject","_wxPyTreeCtrl",SwigwxPyTreeCtrlTowxObject}, { "_wxObject","_wxTreeEvent",SwigwxTreeEventTowxObject}, - { "_wxObject","_wxPyTreeItemData",SwigwxPyTreeItemDataTowxObject}, { "_wxObject","_wxListView",SwigwxListViewTowxObject}, { "_wxObject","_wxPyListCtrl",SwigwxPyListCtrlTowxObject}, { "_wxObject","_wxListEvent",SwigwxListEventTowxObject}, @@ -11378,20 +11726,20 @@ SWIGEXPORT(void) initcontrols2c() { PyDict_SetItemString(d,"wxLIST_FORMAT_CENTER", PyInt_FromLong((long) wxLIST_FORMAT_CENTER)); PyDict_SetItemString(d,"wxTR_NO_BUTTONS", PyInt_FromLong((long) wxTR_NO_BUTTONS)); PyDict_SetItemString(d,"wxTR_HAS_BUTTONS", PyInt_FromLong((long) wxTR_HAS_BUTTONS)); - PyDict_SetItemString(d,"wxTR_TWIST_BUTTONS", PyInt_FromLong((long) wxTR_TWIST_BUTTONS)); PyDict_SetItemString(d,"wxTR_NO_LINES", PyInt_FromLong((long) wxTR_NO_LINES)); - PyDict_SetItemString(d,"wxTR_MAC_BUTTONS", PyInt_FromLong((long) wxTR_MAC_BUTTONS)); - PyDict_SetItemString(d,"wxTR_AQUA_BUTTONS", PyInt_FromLong((long) wxTR_AQUA_BUTTONS)); + PyDict_SetItemString(d,"wxTR_LINES_AT_ROOT", PyInt_FromLong((long) wxTR_LINES_AT_ROOT)); PyDict_SetItemString(d,"wxTR_SINGLE", PyInt_FromLong((long) wxTR_SINGLE)); PyDict_SetItemString(d,"wxTR_MULTIPLE", PyInt_FromLong((long) wxTR_MULTIPLE)); PyDict_SetItemString(d,"wxTR_EXTENDED", PyInt_FromLong((long) wxTR_EXTENDED)); - PyDict_SetItemString(d,"wxTR_FULL_ROW_HIGHLIGHT", PyInt_FromLong((long) wxTR_FULL_ROW_HIGHLIGHT)); + PyDict_SetItemString(d,"wxTR_HAS_VARIABLE_ROW_HEIGHT", PyInt_FromLong((long) wxTR_HAS_VARIABLE_ROW_HEIGHT)); PyDict_SetItemString(d,"wxTR_EDIT_LABELS", PyInt_FromLong((long) wxTR_EDIT_LABELS)); - PyDict_SetItemString(d,"wxTR_LINES_AT_ROOT", PyInt_FromLong((long) wxTR_LINES_AT_ROOT)); PyDict_SetItemString(d,"wxTR_HIDE_ROOT", PyInt_FromLong((long) wxTR_HIDE_ROOT)); PyDict_SetItemString(d,"wxTR_ROW_LINES", PyInt_FromLong((long) wxTR_ROW_LINES)); - PyDict_SetItemString(d,"wxTR_HAS_VARIABLE_ROW_HEIGHT", PyInt_FromLong((long) wxTR_HAS_VARIABLE_ROW_HEIGHT)); + PyDict_SetItemString(d,"wxTR_FULL_ROW_HIGHLIGHT", PyInt_FromLong((long) wxTR_FULL_ROW_HIGHLIGHT)); PyDict_SetItemString(d,"wxTR_DEFAULT_STYLE", PyInt_FromLong((long) wxTR_DEFAULT_STYLE)); + PyDict_SetItemString(d,"wxTR_TWIST_BUTTONS", PyInt_FromLong((long) wxTR_TWIST_BUTTONS)); + PyDict_SetItemString(d,"wxTR_MAC_BUTTONS", PyInt_FromLong((long) wxTR_MAC_BUTTONS)); + PyDict_SetItemString(d,"wxTR_AQUA_BUTTONS", PyInt_FromLong((long) wxTR_AQUA_BUTTONS)); PyDict_SetItemString(d,"wxTreeItemIcon_Normal", PyInt_FromLong((long) wxTreeItemIcon_Normal)); PyDict_SetItemString(d,"wxTreeItemIcon_Selected", PyInt_FromLong((long) wxTreeItemIcon_Selected)); PyDict_SetItemString(d,"wxTreeItemIcon_Expanded", PyInt_FromLong((long) wxTreeItemIcon_Expanded)); @@ -11429,6 +11777,7 @@ SWIGEXPORT(void) initcontrols2c() { PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK)); PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK)); PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_END_DRAG", PyInt_FromLong((long) wxEVT_COMMAND_TREE_END_DRAG)); + PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK)); PyDict_SetItemString(d,"wxDIRCTRL_DIR_ONLY", PyInt_FromLong((long) wxDIRCTRL_DIR_ONLY)); PyDict_SetItemString(d,"wxDIRCTRL_SELECT_FIRST", PyInt_FromLong((long) wxDIRCTRL_SELECT_FIRST)); PyDict_SetItemString(d,"wxDIRCTRL_SHOW_FILTERS", PyInt_FromLong((long) wxDIRCTRL_SHOW_FILTERS)); @@ -11441,6 +11790,15 @@ SWIGEXPORT(void) initcontrols2c() { wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData"); wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl"); wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl"); + PyDict_SetItemString(d,"wxFileIconsTable_folder", PyInt_FromLong((long) wxFileIconsTable::folder)); + PyDict_SetItemString(d,"wxFileIconsTable_folder_open", PyInt_FromLong((long) wxFileIconsTable::folder_open)); + PyDict_SetItemString(d,"wxFileIconsTable_computer", PyInt_FromLong((long) wxFileIconsTable::computer)); + PyDict_SetItemString(d,"wxFileIconsTable_drive", PyInt_FromLong((long) wxFileIconsTable::drive)); + PyDict_SetItemString(d,"wxFileIconsTable_cdrom", PyInt_FromLong((long) wxFileIconsTable::cdrom)); + PyDict_SetItemString(d,"wxFileIconsTable_floppy", PyInt_FromLong((long) wxFileIconsTable::floppy)); + PyDict_SetItemString(d,"wxFileIconsTable_removeable", PyInt_FromLong((long) wxFileIconsTable::removeable)); + PyDict_SetItemString(d,"wxFileIconsTable_file", PyInt_FromLong((long) wxFileIconsTable::file)); + PyDict_SetItemString(d,"wxFileIconsTable_executable", PyInt_FromLong((long) wxFileIconsTable::executable)); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py index ff7d2087ff..846605012c 100644 --- a/wxPython/src/msw/controls2.py +++ b/wxPython/src/msw/controls2.py @@ -90,9 +90,6 @@ def EVT_TREE_BEGIN_DRAG(win, id, func): def EVT_TREE_BEGIN_RDRAG(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func) -def EVT_TREE_END_DRAG(win, id, func): - win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func) - def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func) @@ -138,45 +135,52 @@ def EVT_TREE_ITEM_RIGHT_CLICK(win, id, func): def EVT_TREE_ITEM_MIDDLE_CLICK(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, func) +def EVT_TREE_END_DRAG(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func) + +def EVT_TREE_STATE_IMAGE_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, func) + + class wxListItemAttrPtr : def __init__(self,this): self.this = this self.thisown = 0 def SetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_SetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_SetTextColour(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_SetBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_SetBackgroundColour(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_SetFont,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_SetFont(self, *_args, **_kwargs) return val def HasTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_HasTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_HasTextColour(self, *_args, **_kwargs) return val def HasBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_HasBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_HasBackgroundColour(self, *_args, **_kwargs) return val def HasFont(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_HasFont,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_HasFont(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_GetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_GetBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetFont(self, *_args, **_kwargs): - val = apply(controls2c.wxListItemAttr_GetFont,(self,) + _args, _kwargs) + val = controls2c.wxListItemAttr_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxListItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxListItemAttr(wxListItemAttrPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxListItemAttr,_args,_kwargs) + self.this = controls2c.new_wxListItemAttr(*_args,**_kwargs) self.thisown = 1 @@ -193,94 +197,94 @@ class wxListItemPtr(wxObjectPtr): except: pass def Clear(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_Clear,(self,) + _args, _kwargs) + val = controls2c.wxListItem_Clear(self, *_args, **_kwargs) return val def ClearAttributes(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_ClearAttributes,(self,) + _args, _kwargs) + val = controls2c.wxListItem_ClearAttributes(self, *_args, **_kwargs) return val def SetMask(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetMask,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetMask(self, *_args, **_kwargs) return val def SetId(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetId,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetId(self, *_args, **_kwargs) return val def SetColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetColumn,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetColumn(self, *_args, **_kwargs) return val def SetState(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetState,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetState(self, *_args, **_kwargs) return val def SetStateMask(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetStateMask,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetStateMask(self, *_args, **_kwargs) return val def SetText(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetText,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetText(self, *_args, **_kwargs) return val def SetImage(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetImage,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetImage(self, *_args, **_kwargs) return val def SetData(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetData,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetData(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetWidth,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetWidth(self, *_args, **_kwargs) return val def SetAlign(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetAlign,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetAlign(self, *_args, **_kwargs) return val def SetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetTextColour(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetBackgroundColour(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_SetFont,(self,) + _args, _kwargs) + val = controls2c.wxListItem_SetFont(self, *_args, **_kwargs) return val def GetMask(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetMask,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetMask(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetId,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetId(self, *_args, **_kwargs) return val def GetColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetColumn,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetColumn(self, *_args, **_kwargs) return val def GetState(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetState,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetState(self, *_args, **_kwargs) return val def GetText(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetText,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetText(self, *_args, **_kwargs) return val def GetImage(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetImage,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetImage(self, *_args, **_kwargs) return val def GetData(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetData,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetData(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetWidth,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetWidth(self, *_args, **_kwargs) return val def GetAlign(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetAlign,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetAlign(self, *_args, **_kwargs) return val def GetAttributes(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetAttributes,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetAttributes(self, *_args, **_kwargs) if val: val = wxListItemAttrPtr(val) return val def HasAttributes(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_HasAttributes,(self,) + _args, _kwargs) + val = controls2c.wxListItem_HasAttributes(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetFont(self, *_args, **_kwargs): - val = apply(controls2c.wxListItem_GetFont,(self,) + _args, _kwargs) + val = controls2c.wxListItem_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def __setattr__(self,name,value): @@ -338,10 +342,10 @@ class wxListItemPtr(wxObjectPtr): return controls2c.wxListItem_m_width_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxListItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxListItem(wxListItemPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxListItem,_args,_kwargs) + self.this = controls2c.new_wxListItem(*_args,**_kwargs) self.thisown = 1 @@ -352,41 +356,41 @@ class wxListEventPtr(wxNotifyEventPtr): self.this = this self.thisown = 0 def GetKeyCode(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetKeyCode,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetKeyCode(self, *_args, **_kwargs) return val def GetIndex(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetIndex,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetIndex(self, *_args, **_kwargs) return val def GetColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetColumn,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetColumn(self, *_args, **_kwargs) return val def GetPoint(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetPoint,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetPoint(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetLabel(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetLabel,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetLabel(self, *_args, **_kwargs) return val def GetText(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetText,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetText(self, *_args, **_kwargs) return val def GetImage(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetImage,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetImage(self, *_args, **_kwargs) return val def GetData(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetData,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetData(self, *_args, **_kwargs) return val def GetMask(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetMask,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetMask(self, *_args, **_kwargs) return val def GetItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetItem,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetItem(self, *_args, **_kwargs) return val def GetCacheFrom(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetCacheFrom,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetCacheFrom(self, *_args, **_kwargs) return val def GetCacheTo(self, *_args, **_kwargs): - val = apply(controls2c.wxListEvent_GetCacheTo,(self,) + _args, _kwargs) + val = controls2c.wxListEvent_GetCacheTo(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "m_code" : @@ -423,11 +427,11 @@ class wxListEventPtr(wxNotifyEventPtr): return wxListItemPtr(controls2c.wxListEvent_m_item_get(self)) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxListEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) GetCode = GetKeyCode class wxListEvent(wxListEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxListEvent,_args,_kwargs) + self.this = controls2c.new_wxListEvent(*_args,**_kwargs) self.thisown = 1 @@ -438,220 +442,220 @@ class wxListCtrlPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_Create,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_Create(self, *_args, **_kwargs) return val def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl__setCallbackInfo,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl__setCallbackInfo(self, *_args, **_kwargs) return val def SetForegroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetForegroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetForegroundColour(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetBackgroundColour(self, *_args, **_kwargs) return val def GetColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs) return val def SetColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetColumn,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetColumn(self, *_args, **_kwargs) return val def GetColumnWidth(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetColumnWidth,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetColumnWidth(self, *_args, **_kwargs) return val def SetColumnWidth(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetColumnWidth,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetColumnWidth(self, *_args, **_kwargs) return val def GetCountPerPage(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetCountPerPage,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetCountPerPage(self, *_args, **_kwargs) return val def GetEditControl(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetEditControl,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetEditControl(self, *_args, **_kwargs) return val def GetItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItem(self, *_args, **_kwargs) return val def SetItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItem(self, *_args, **_kwargs) return val def SetStringItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetStringItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetStringItem(self, *_args, **_kwargs) return val def GetItemState(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemState,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemState(self, *_args, **_kwargs) return val def SetItemState(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemState,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemState(self, *_args, **_kwargs) return val def SetItemImage(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemImage,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemImage(self, *_args, **_kwargs) return val def GetItemText(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemText,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemText(self, *_args, **_kwargs) return val def SetItemText(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemText,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemText(self, *_args, **_kwargs) return val def GetItemData(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemData,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemData(self, *_args, **_kwargs) return val def SetItemData(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemData,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemData(self, *_args, **_kwargs) return val def GetItemPosition(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemPosition,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetItemRect(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemRect,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def SetItemPosition(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemPosition,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemPosition(self, *_args, **_kwargs) return val def GetItemCount(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemCount,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemCount(self, *_args, **_kwargs) return val def GetColumnCount(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetColumnCount,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetColumnCount(self, *_args, **_kwargs) return val def GetItemSpacing(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemSpacing,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemSpacing(self, *_args, **_kwargs) return val def GetSelectedItemCount(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetSelectedItemCount,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetSelectedItemCount(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetTextColour(self, *_args, **_kwargs) return val def GetTopItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetTopItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetTopItem(self, *_args, **_kwargs) return val def SetSingleStyle(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetSingleStyle,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetSingleStyle(self, *_args, **_kwargs) return val def SetWindowStyleFlag(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetWindowStyleFlag,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetWindowStyleFlag(self, *_args, **_kwargs) return val def GetNextItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetNextItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetNextItem(self, *_args, **_kwargs) return val def GetImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetImageList,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetImageList(self, *_args, **_kwargs) return val def SetImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetImageList,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetImageList(self, *_args, **_kwargs) return val def AssignImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_AssignImageList,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_AssignImageList(self, *_args, **_kwargs) _args[0].thisown = 0 return val def IsVirtual(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_IsVirtual,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_IsVirtual(self, *_args, **_kwargs) return val def RefreshItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_RefreshItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_RefreshItem(self, *_args, **_kwargs) return val def RefreshItems(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_RefreshItems,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_RefreshItems(self, *_args, **_kwargs) return val def Arrange(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_Arrange,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_Arrange(self, *_args, **_kwargs) return val def DeleteItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_DeleteItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_DeleteItem(self, *_args, **_kwargs) return val def DeleteAllItems(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_DeleteAllItems,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_DeleteAllItems(self, *_args, **_kwargs) return val def DeleteColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_DeleteColumn,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_DeleteColumn(self, *_args, **_kwargs) return val def DeleteAllColumns(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_DeleteAllColumns,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_DeleteAllColumns(self, *_args, **_kwargs) return val def ClearAll(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_ClearAll,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_ClearAll(self, *_args, **_kwargs) return val def EditLabel(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_EditLabel,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_EditLabel(self, *_args, **_kwargs) return val def EndEditLabel(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_EndEditLabel,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_EndEditLabel(self, *_args, **_kwargs) return val def EnsureVisible(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_EnsureVisible,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_EnsureVisible(self, *_args, **_kwargs) return val def FindItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_FindItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_FindItem(self, *_args, **_kwargs) return val def FindItemData(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_FindItemData,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_FindItemData(self, *_args, **_kwargs) return val def FindItemAtPos(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_FindItemAtPos,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_FindItemAtPos(self, *_args, **_kwargs) return val def HitTest(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_HitTest,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_HitTest(self, *_args, **_kwargs) return val def InsertItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_InsertItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_InsertItem(self, *_args, **_kwargs) return val def InsertStringItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_InsertStringItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_InsertStringItem(self, *_args, **_kwargs) return val def InsertImageItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_InsertImageItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_InsertImageItem(self, *_args, **_kwargs) return val def InsertImageStringItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_InsertImageStringItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_InsertImageStringItem(self, *_args, **_kwargs) return val def InsertColumnInfo(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_InsertColumnInfo,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_InsertColumnInfo(self, *_args, **_kwargs) return val def InsertColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_InsertColumn,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_InsertColumn(self, *_args, **_kwargs) return val def SetItemCount(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemCount,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemCount(self, *_args, **_kwargs) return val def ScrollList(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_ScrollList,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_ScrollList(self, *_args, **_kwargs) return val def SetItemTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemTextColour(self, *_args, **_kwargs) return val def GetItemTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemTextColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetItemBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SetItemBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SetItemBackgroundColour(self, *_args, **_kwargs) return val def GetItemBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItemBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItemBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SortItems(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_SortItems,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_SortItems(self, *_args, **_kwargs) return val def GetMainWindow(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetMainWindow,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetMainWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def GetColumn(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs) if val is not None: val.thisown = 1 return val def GetItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs) + val = controls2c.wxListCtrl_GetItem(self, *_args, **_kwargs) if val is not None: val.thisown = 1 return val @@ -710,7 +714,7 @@ class wxListCtrlPtr(wxControlPtr): class wxListCtrl(wxListCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxListCtrl,_args,_kwargs) + self.this = controls2c.new_wxListCtrl(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxListCtrl) self._setOORInfo(self) @@ -718,7 +722,7 @@ class wxListCtrl(wxListCtrlPtr): def wxPreListCtrl(*_args,**_kwargs): - val = wxListCtrlPtr(apply(controls2c.new_wxPreListCtrl,_args,_kwargs)) + val = wxListCtrlPtr(controls2c.new_wxPreListCtrl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -729,44 +733,44 @@ class wxListViewPtr(wxListCtrlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_Create,(self,) + _args, _kwargs) + val = controls2c.wxListView_Create(self, *_args, **_kwargs) return val def Select(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_Select,(self,) + _args, _kwargs) + val = controls2c.wxListView_Select(self, *_args, **_kwargs) return val def Focus(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_Focus,(self,) + _args, _kwargs) + val = controls2c.wxListView_Focus(self, *_args, **_kwargs) return val def GetFocusedItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_GetFocusedItem,(self,) + _args, _kwargs) + val = controls2c.wxListView_GetFocusedItem(self, *_args, **_kwargs) return val def GetNextSelected(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_GetNextSelected,(self,) + _args, _kwargs) + val = controls2c.wxListView_GetNextSelected(self, *_args, **_kwargs) return val def GetFirstSelected(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_GetFirstSelected,(self,) + _args, _kwargs) + val = controls2c.wxListView_GetFirstSelected(self, *_args, **_kwargs) return val def IsSelected(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_IsSelected,(self,) + _args, _kwargs) + val = controls2c.wxListView_IsSelected(self, *_args, **_kwargs) return val def SetColumnImage(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_SetColumnImage,(self,) + _args, _kwargs) + val = controls2c.wxListView_SetColumnImage(self, *_args, **_kwargs) return val def ClearColumnImage(self, *_args, **_kwargs): - val = apply(controls2c.wxListView_ClearColumnImage,(self,) + _args, _kwargs) + val = controls2c.wxListView_ClearColumnImage(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxListView instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxListView(wxListViewPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxListView,_args,_kwargs) + self.this = controls2c.new_wxListView(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreListView(*_args,**_kwargs): - val = wxListViewPtr(apply(controls2c.new_wxPreListView,_args,_kwargs)) + val = wxListViewPtr(controls2c.new_wxPreListView(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -777,40 +781,40 @@ class wxTreeItemAttrPtr : self.this = this self.thisown = 0 def SetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_SetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_SetTextColour(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_SetBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_SetBackgroundColour(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_SetFont,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_SetFont(self, *_args, **_kwargs) return val def HasTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_HasTextColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_HasTextColour(self, *_args, **_kwargs) return val def HasBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_HasBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_HasBackgroundColour(self, *_args, **_kwargs) return val def HasFont(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_HasFont,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_HasFont(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_GetTextColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_GetBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetFont(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemAttr_GetFont,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemAttr_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTreeItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTreeItemAttr(wxTreeItemAttrPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxTreeItemAttr,_args,_kwargs) + self.this = controls2c.new_wxTreeItemAttr(*_args,**_kwargs) self.thisown = 1 @@ -827,44 +831,48 @@ class wxTreeItemIdPtr : except: pass def IsOk(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemId_IsOk,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemId_IsOk(self, *_args, **_kwargs) return val def __cmp__(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemId___cmp__,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemId___cmp__(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTreeItemId instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + Ok = IsOk + def __nonzero__(self): + return self.IsOk() + class wxTreeItemId(wxTreeItemIdPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxTreeItemId,_args,_kwargs) + self.this = controls2c.new_wxTreeItemId(*_args,**_kwargs) self.thisown = 1 -class wxTreeItemDataPtr(wxObjectPtr): +class wxTreeItemDataPtr : def __init__(self,this): self.this = this self.thisown = 0 def GetData(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemData_GetData,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemData_GetData(self, *_args, **_kwargs) return val def SetData(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemData_SetData,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemData_SetData(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemData_GetId,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemData_GetId(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) return val def SetId(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeItemData_SetId,(self,) + _args, _kwargs) + val = controls2c.wxTreeItemData_SetId(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTreeItemData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTreeItemData(wxTreeItemDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxTreeItemData,_args,_kwargs) + self.this = controls2c.new_wxTreeItemData(*_args,**_kwargs) self.thisown = 1 @@ -875,36 +883,53 @@ class wxTreeEventPtr(wxNotifyEventPtr): self.this = this self.thisown = 0 def GetItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeEvent_GetItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeEvent_GetItem(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val + def SetItem(self, *_args, **_kwargs): + val = controls2c.wxTreeEvent_SetItem(self, *_args, **_kwargs) + return val def GetOldItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeEvent_GetOldItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeEvent_GetOldItem(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val + def SetOldItem(self, *_args, **_kwargs): + val = controls2c.wxTreeEvent_SetOldItem(self, *_args, **_kwargs) + return val def GetPoint(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeEvent_GetPoint,(self,) + _args, _kwargs) + val = controls2c.wxTreeEvent_GetPoint(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val + def SetPoint(self, *_args, **_kwargs): + val = controls2c.wxTreeEvent_SetPoint(self, *_args, **_kwargs) + return val def GetKeyEvent(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeEvent_GetKeyEvent,(self,) + _args, _kwargs) + val = controls2c.wxTreeEvent_GetKeyEvent(self, *_args, **_kwargs) if val: val = wxKeyEventPtr(val) return val def GetKeyCode(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeEvent_GetKeyCode,(self,) + _args, _kwargs) + val = controls2c.wxTreeEvent_GetKeyCode(self, *_args, **_kwargs) + return val + def SetKeyEvent(self, *_args, **_kwargs): + val = controls2c.wxTreeEvent_SetKeyEvent(self, *_args, **_kwargs) return val def GetLabel(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeEvent_GetLabel,(self,) + _args, _kwargs) + val = controls2c.wxTreeEvent_GetLabel(self, *_args, **_kwargs) + return val + def SetLabel(self, *_args, **_kwargs): + val = controls2c.wxTreeEvent_SetLabel(self, *_args, **_kwargs) return val def IsEditCancelled(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeEvent_IsEditCancelled,(self,) + _args, _kwargs) + val = controls2c.wxTreeEvent_IsEditCancelled(self, *_args, **_kwargs) + return val + def SetEditCanceled(self, *_args, **_kwargs): + val = controls2c.wxTreeEvent_SetEditCanceled(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) - GetCode = GetKeyCode + return "<%s.%s instance; proxy of C++ wxTreeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTreeEvent(wxTreeEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxTreeEvent,_args,_kwargs) + self.this = controls2c.new_wxTreeEvent(*_args,**_kwargs) self.thisown = 1 @@ -915,267 +940,267 @@ class wxTreeCtrlPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_Create,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_Create(self, *_args, **_kwargs) return val def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl__setCallbackInfo,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl__setCallbackInfo(self, *_args, **_kwargs) return val def GetCount(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetCount,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetCount(self, *_args, **_kwargs) return val def GetIndent(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetIndent,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetIndent(self, *_args, **_kwargs) return val def SetIndent(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetIndent,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetIndent(self, *_args, **_kwargs) return val def GetImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetImageList,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetImageList(self, *_args, **_kwargs) return val def GetStateImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetStateImageList,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetStateImageList(self, *_args, **_kwargs) return val def SetImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetImageList,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetImageList(self, *_args, **_kwargs) return val def SetStateImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetStateImageList,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetStateImageList(self, *_args, **_kwargs) return val def AssignImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_AssignImageList,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_AssignImageList(self, *_args, **_kwargs) _args[0].thisown = 0 return val def AssignStateImageList(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_AssignStateImageList,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_AssignStateImageList(self, *_args, **_kwargs) _args[0].thisown = 0 return val def GetSpacing(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetSpacing,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetSpacing(self, *_args, **_kwargs) return val def SetSpacing(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetSpacing,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetSpacing(self, *_args, **_kwargs) return val def GetItemText(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemText,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemText(self, *_args, **_kwargs) return val def GetItemImage(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemImage,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemImage(self, *_args, **_kwargs) return val def GetItemSelectedImage(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemSelectedImage,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemSelectedImage(self, *_args, **_kwargs) return val def SetItemText(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemText,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemText(self, *_args, **_kwargs) return val def SetItemImage(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemImage,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemImage(self, *_args, **_kwargs) return val def SetItemSelectedImage(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemSelectedImage,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemSelectedImage(self, *_args, **_kwargs) return val def SetItemHasChildren(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemHasChildren(self, *_args, **_kwargs) return val def GetItemData(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemData,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemData(self, *_args, **_kwargs) if val: val = wxTreeItemDataPtr(val) return val def SetItemData(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemData,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemData(self, *_args, **_kwargs) return val def GetPyData(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetPyData,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetPyData(self, *_args, **_kwargs) return val def SetPyData(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetPyData,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetPyData(self, *_args, **_kwargs) return val def GetItemTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemTextColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetItemBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetItemFont(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemFont,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def IsVisible(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_IsVisible,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_IsVisible(self, *_args, **_kwargs) return val def ItemHasChildren(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_ItemHasChildren,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_ItemHasChildren(self, *_args, **_kwargs) return val def IsExpanded(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_IsExpanded,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_IsExpanded(self, *_args, **_kwargs) return val def IsSelected(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_IsSelected,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_IsSelected(self, *_args, **_kwargs) return val def GetRootItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetRootItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetRootItem(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetSelection(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetSelection,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetSelection(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetItemParent(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetItemParent,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetItemParent(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetSelections(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetSelections,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetSelections(self, *_args, **_kwargs) return val def GetChildrenCount(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetChildrenCount,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetChildrenCount(self, *_args, **_kwargs) return val def GetFirstChild(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetFirstChild,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetFirstChild(self, *_args, **_kwargs) return val def GetNextChild(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetNextChild,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetNextChild(self, *_args, **_kwargs) return val def GetNextSibling(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetNextSibling,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetNextSibling(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetPrevSibling(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetPrevSibling,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetPrevSibling(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetFirstVisibleItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetFirstVisibleItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetNextVisible(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetNextVisible,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetNextVisible(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetPrevVisible(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetPrevVisible,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetPrevVisible(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetLastChild(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetLastChild,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetLastChild(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def AddRoot(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_AddRoot,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_AddRoot(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def PrependItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_PrependItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_PrependItem(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def InsertItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_InsertItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_InsertItem(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def InsertItemBefore(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_InsertItemBefore,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_InsertItemBefore(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def AppendItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_AppendItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_AppendItem(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def Delete(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_Delete,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_Delete(self, *_args, **_kwargs) return val def DeleteChildren(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_DeleteChildren,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_DeleteChildren(self, *_args, **_kwargs) return val def DeleteAllItems(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_DeleteAllItems,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_DeleteAllItems(self, *_args, **_kwargs) return val def Expand(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_Expand,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_Expand(self, *_args, **_kwargs) return val def Collapse(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_Collapse,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_Collapse(self, *_args, **_kwargs) return val def CollapseAndReset(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_CollapseAndReset,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_CollapseAndReset(self, *_args, **_kwargs) return val def Toggle(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_Toggle,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_Toggle(self, *_args, **_kwargs) return val def Unselect(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_Unselect,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_Unselect(self, *_args, **_kwargs) return val def UnselectAll(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_UnselectAll,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_UnselectAll(self, *_args, **_kwargs) return val def SelectItem(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SelectItem,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SelectItem(self, *_args, **_kwargs) return val def EnsureVisible(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_EnsureVisible,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_EnsureVisible(self, *_args, **_kwargs) return val def ScrollTo(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_ScrollTo,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_ScrollTo(self, *_args, **_kwargs) return val def GetEditControl(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetEditControl,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetEditControl(self, *_args, **_kwargs) return val def EditLabel(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_EditLabel,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_EditLabel(self, *_args, **_kwargs) return val def EndEditLabel(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_EndEditLabel(self, *_args, **_kwargs) return val def SortChildren(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SortChildren,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SortChildren(self, *_args, **_kwargs) return val def SetItemBold(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemBold,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemBold(self, *_args, **_kwargs) return val def IsBold(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_IsBold,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_IsBold(self, *_args, **_kwargs) return val def HitTest(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_HitTest,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_HitTest(self, *_args, **_kwargs) return val def SetItemTextColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemTextColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemTextColour(self, *_args, **_kwargs) return val def SetItemBackgroundColour(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemBackgroundColour,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemBackgroundColour(self, *_args, **_kwargs) return val def SetItemFont(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemFont,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemFont(self, *_args, **_kwargs) return val def SetItemDropHighlight(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_SetItemDropHighlight,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_SetItemDropHighlight(self, *_args, **_kwargs) return val def GetBoundingRect(self, *_args, **_kwargs): - val = apply(controls2c.wxTreeCtrl_GetBoundingRect,(self,) + _args, _kwargs) + val = controls2c.wxTreeCtrl_GetBoundingRect(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) # Redefine some methods that SWIG gets a bit confused on... def GetFirstChild(self, *_args, **_kwargs): - val1,val2 = apply(controls2c.wxTreeCtrl_GetFirstChild,(self,) + _args, _kwargs) + val1,val2 = controls2c.wxTreeCtrl_GetFirstChild(self, *_args, **_kwargs) val1 = wxTreeItemIdPtr(val1) val1.thisown = 1 return (val1,val2) def GetNextChild(self, *_args, **_kwargs): - val1,val2 = apply(controls2c.wxTreeCtrl_GetNextChild,(self,) + _args, _kwargs) + val1,val2 = controls2c.wxTreeCtrl_GetNextChild(self, *_args, **_kwargs) val1 = wxTreeItemIdPtr(val1) val1.thisown = 1 return (val1,val2) def HitTest(self, *_args, **_kwargs): - val1, val2 = apply(controls2c.wxTreeCtrl_HitTest,(self,) + _args, _kwargs) + val1, val2 = controls2c.wxTreeCtrl_HitTest(self, *_args, **_kwargs) val1 = wxTreeItemIdPtr(val1) val1.thisown = 1 return (val1,val2) class wxTreeCtrl(wxTreeCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxTreeCtrl,_args,_kwargs) + self.this = controls2c.new_wxTreeCtrl(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxTreeCtrl) self._setOORInfo(self) @@ -1183,7 +1208,7 @@ class wxTreeCtrl(wxTreeCtrlPtr): def wxPreTreeCtrl(*_args,**_kwargs): - val = wxTreeCtrlPtr(apply(controls2c.new_wxPreTreeCtrl,_args,_kwargs)) + val = wxTreeCtrlPtr(controls2c.new_wxPreTreeCtrl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -1194,7 +1219,7 @@ class wxDirItemDataPtr(wxObjectPtr): self.this = this self.thisown = 0 def SetNewDirName(self, *_args, **_kwargs): - val = apply(controls2c.wxDirItemData_SetNewDirName,(self,) + _args, _kwargs) + val = controls2c.wxDirItemData_SetNewDirName(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "m_path" : @@ -1226,10 +1251,10 @@ class wxDirItemDataPtr(wxObjectPtr): return controls2c.wxDirItemData_m_isDir_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDirItemData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDirItemData(wxDirItemDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxDirItemData,_args,_kwargs) + self.this = controls2c.new_wxDirItemData(*_args,**_kwargs) self.thisown = 1 @@ -1240,67 +1265,70 @@ class wxGenericDirCtrlPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_Create,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_Create(self, *_args, **_kwargs) return val def ExpandPath(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_ExpandPath,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_ExpandPath(self, *_args, **_kwargs) return val def GetDefaultPath(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetDefaultPath,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetDefaultPath(self, *_args, **_kwargs) return val def SetDefaultPath(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_SetDefaultPath,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_SetDefaultPath(self, *_args, **_kwargs) return val def GetPath(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetPath,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetPath(self, *_args, **_kwargs) return val def GetFilePath(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetFilePath,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetFilePath(self, *_args, **_kwargs) return val def SetPath(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_SetPath,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_SetPath(self, *_args, **_kwargs) return val def ShowHidden(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_ShowHidden,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_ShowHidden(self, *_args, **_kwargs) return val def GetShowHidden(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetShowHidden,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetShowHidden(self, *_args, **_kwargs) return val def GetFilter(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetFilter,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetFilter(self, *_args, **_kwargs) return val def SetFilter(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_SetFilter,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_SetFilter(self, *_args, **_kwargs) return val def GetFilterIndex(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetFilterIndex,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetFilterIndex(self, *_args, **_kwargs) return val def SetFilterIndex(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_SetFilterIndex,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_SetFilterIndex(self, *_args, **_kwargs) return val def GetRootId(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetRootId,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetRootId(self, *_args, **_kwargs) if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1 return val def GetTreeCtrl(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetTreeCtrl,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetTreeCtrl(self, *_args, **_kwargs) return val def GetFilterListCtrl(self, *_args, **_kwargs): - val = apply(controls2c.wxGenericDirCtrl_GetFilterListCtrl,(self,) + _args, _kwargs) + val = controls2c.wxGenericDirCtrl_GetFilterListCtrl(self, *_args, **_kwargs) if val: val = wxDirFilterListCtrlPtr(val) return val + def ReCreateTree(self, *_args, **_kwargs): + val = controls2c.wxGenericDirCtrl_ReCreateTree(self, *_args, **_kwargs) + return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGenericDirCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGenericDirCtrl(wxGenericDirCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxGenericDirCtrl,_args,_kwargs) + self.this = controls2c.new_wxGenericDirCtrl(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreGenericDirCtrl(*_args,**_kwargs): - val = wxGenericDirCtrlPtr(apply(controls2c.new_wxPreGenericDirCtrl,_args,_kwargs)) + val = wxGenericDirCtrlPtr(controls2c.new_wxPreGenericDirCtrl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -1311,28 +1339,63 @@ class wxDirFilterListCtrlPtr(wxChoicePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(controls2c.wxDirFilterListCtrl_Create,(self,) + _args, _kwargs) + val = controls2c.wxDirFilterListCtrl_Create(self, *_args, **_kwargs) return val def FillFilterList(self, *_args, **_kwargs): - val = apply(controls2c.wxDirFilterListCtrl_FillFilterList,(self,) + _args, _kwargs) + val = controls2c.wxDirFilterListCtrl_FillFilterList(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDirFilterListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDirFilterListCtrl(wxDirFilterListCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(controls2c.new_wxDirFilterListCtrl,_args,_kwargs) + self.this = controls2c.new_wxDirFilterListCtrl(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreDirFilterListCtrl(*_args,**_kwargs): - val = wxDirFilterListCtrlPtr(apply(controls2c.new_wxPreDirFilterListCtrl,_args,_kwargs)) + val = wxDirFilterListCtrlPtr(controls2c.new_wxPreDirFilterListCtrl(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val +class wxFileIconsTablePtr : + folder = controls2c.wxFileIconsTable_folder + folder_open = controls2c.wxFileIconsTable_folder_open + computer = controls2c.wxFileIconsTable_computer + drive = controls2c.wxFileIconsTable_drive + cdrom = controls2c.wxFileIconsTable_cdrom + floppy = controls2c.wxFileIconsTable_floppy + removeable = controls2c.wxFileIconsTable_removeable + file = controls2c.wxFileIconsTable_file + executable = controls2c.wxFileIconsTable_executable + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=controls2c.delete_wxFileIconsTable): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def GetIconID(self, *_args, **_kwargs): + val = controls2c.wxFileIconsTable_GetIconID(self, *_args, **_kwargs) + return val + def GetSmallImageList(self, *_args, **_kwargs): + val = controls2c.wxFileIconsTable_GetSmallImageList(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxFileIconsTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxFileIconsTable(wxFileIconsTablePtr): + def __init__(self,*_args,**_kwargs): + self.this = controls2c.new_wxFileIconsTable(*_args,**_kwargs) + self.thisown = 1 + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -1429,20 +1492,20 @@ wxLIST_FORMAT_CENTRE = controls2c.wxLIST_FORMAT_CENTRE wxLIST_FORMAT_CENTER = controls2c.wxLIST_FORMAT_CENTER wxTR_NO_BUTTONS = controls2c.wxTR_NO_BUTTONS wxTR_HAS_BUTTONS = controls2c.wxTR_HAS_BUTTONS -wxTR_TWIST_BUTTONS = controls2c.wxTR_TWIST_BUTTONS wxTR_NO_LINES = controls2c.wxTR_NO_LINES -wxTR_MAC_BUTTONS = controls2c.wxTR_MAC_BUTTONS -wxTR_AQUA_BUTTONS = controls2c.wxTR_AQUA_BUTTONS +wxTR_LINES_AT_ROOT = controls2c.wxTR_LINES_AT_ROOT wxTR_SINGLE = controls2c.wxTR_SINGLE wxTR_MULTIPLE = controls2c.wxTR_MULTIPLE wxTR_EXTENDED = controls2c.wxTR_EXTENDED -wxTR_FULL_ROW_HIGHLIGHT = controls2c.wxTR_FULL_ROW_HIGHLIGHT +wxTR_HAS_VARIABLE_ROW_HEIGHT = controls2c.wxTR_HAS_VARIABLE_ROW_HEIGHT wxTR_EDIT_LABELS = controls2c.wxTR_EDIT_LABELS -wxTR_LINES_AT_ROOT = controls2c.wxTR_LINES_AT_ROOT wxTR_HIDE_ROOT = controls2c.wxTR_HIDE_ROOT wxTR_ROW_LINES = controls2c.wxTR_ROW_LINES -wxTR_HAS_VARIABLE_ROW_HEIGHT = controls2c.wxTR_HAS_VARIABLE_ROW_HEIGHT +wxTR_FULL_ROW_HIGHLIGHT = controls2c.wxTR_FULL_ROW_HIGHLIGHT wxTR_DEFAULT_STYLE = controls2c.wxTR_DEFAULT_STYLE +wxTR_TWIST_BUTTONS = controls2c.wxTR_TWIST_BUTTONS +wxTR_MAC_BUTTONS = controls2c.wxTR_MAC_BUTTONS +wxTR_AQUA_BUTTONS = controls2c.wxTR_AQUA_BUTTONS wxTreeItemIcon_Normal = controls2c.wxTreeItemIcon_Normal wxTreeItemIcon_Selected = controls2c.wxTreeItemIcon_Selected wxTreeItemIcon_Expanded = controls2c.wxTreeItemIcon_Expanded @@ -1480,6 +1543,7 @@ wxEVT_COMMAND_TREE_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_TREE_ITEM_ACTIVATED wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK wxEVT_COMMAND_TREE_END_DRAG = controls2c.wxEVT_COMMAND_TREE_END_DRAG +wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = controls2c.wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK wxDIRCTRL_DIR_ONLY = controls2c.wxDIRCTRL_DIR_ONLY wxDIRCTRL_SELECT_FIRST = controls2c.wxDIRCTRL_SELECT_FIRST wxDIRCTRL_SHOW_FILTERS = controls2c.wxDIRCTRL_SHOW_FILTERS diff --git a/wxPython/src/msw/events.cpp b/wxPython/src/msw/events.cpp index d04e053f9b..d62da54e61 100644 --- a/wxPython/src/msw/events.cpp +++ b/wxPython/src/msw/events.cpp @@ -224,34 +224,6 @@ static PyObject *_wrap_wxEvent_GetId(PyObject *self, PyObject *args, PyObject *k return _resultobj; } -#define wxEvent_GetSkipped(_swigobj) (_swigobj->GetSkipped()) -static PyObject *_wrap_wxEvent_GetSkipped(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxEvent * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetSkipped",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetSkipped. Expected _wxEvent_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxEvent_GetSkipped(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - #define wxEvent_GetTimestamp(_swigobj) (_swigobj->GetTimestamp()) static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -404,6 +376,34 @@ static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args, PyOb return _resultobj; } +#define wxEvent_IsCommandEvent(_swigobj) (_swigobj->IsCommandEvent()) +static PyObject *_wrap_wxEvent_IsCommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_IsCommandEvent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_IsCommandEvent. Expected _wxEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxEvent_IsCommandEvent(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxEvent_Skip(_swigobj,_swigarg0) (_swigobj->Skip(_swigarg0)) static PyObject *_wrap_wxEvent_Skip(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -435,6 +435,119 @@ static PyObject *_wrap_wxEvent_Skip(PyObject *self, PyObject *args, PyObject *kw return _resultobj; } +#define wxEvent_GetSkipped(_swigobj) (_swigobj->GetSkipped()) +static PyObject *_wrap_wxEvent_GetSkipped(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetSkipped",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetSkipped. Expected _wxEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxEvent_GetSkipped(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxEvent_ShouldPropagate(_swigobj) (_swigobj->ShouldPropagate()) +static PyObject *_wrap_wxEvent_ShouldPropagate(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_ShouldPropagate",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_ShouldPropagate. Expected _wxEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxEvent_ShouldPropagate(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxEvent_StopPropagation(_swigobj) (_swigobj->StopPropagation()) +static PyObject *_wrap_wxEvent_StopPropagation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_StopPropagation",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_StopPropagation. Expected _wxEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxEvent_StopPropagation(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxEvent_ResumePropagation(_swigobj,_swigarg0) (_swigobj->ResumePropagation(_swigarg0)) +static PyObject *_wrap_wxEvent_ResumePropagation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvent * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","propagationLevel", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxEvent_ResumePropagation",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_ResumePropagation. Expected _wxEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxEvent_ResumePropagation(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxEvent_Clone(_swigobj) (_swigobj->Clone()) static PyObject *_wrap_wxEvent_Clone(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -470,6 +583,130 @@ static PyObject *_wrap_wxEvent_Clone(PyObject *self, PyObject *args, PyObject *k return _resultobj; } +#define new_wxPropagationDisabler(_swigarg0) (new wxPropagationDisabler(_swigarg0)) +static PyObject *_wrap_new_wxPropagationDisabler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPropagationDisabler * _result; + wxEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "event", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxPropagationDisabler",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPropagationDisabler. Expected _wxEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPropagationDisabler *)new_wxPropagationDisabler(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPropagationDisabler_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxPropagationDisabler(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxPropagationDisabler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPropagationDisabler * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPropagationDisabler",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPropagationDisabler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPropagationDisabler. Expected _wxPropagationDisabler_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxPropagationDisabler(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define new_wxPropagateOnce(_swigarg0) (new wxPropagateOnce(_swigarg0)) +static PyObject *_wrap_new_wxPropagateOnce(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPropagateOnce * _result; + wxEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "event", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxPropagateOnce",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPropagateOnce. Expected _wxEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPropagateOnce *)new_wxPropagateOnce(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPropagateOnce_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxPropagateOnce(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxPropagateOnce(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPropagateOnce * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPropagateOnce",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPropagateOnce_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPropagateOnce. Expected _wxPropagateOnce_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxPropagateOnce(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxSizeEventTowxEvent(void *ptr) { wxSizeEvent *src; wxEvent *dest; @@ -504,50 +741,116 @@ static PyObject *_wrap_new_wxSizeEvent(PyObject *self, PyObject *args, PyObject _arg0 = &temp; if (! wxSize_helper(_obj0, &_arg0)) return NULL; -} +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxSizeEvent *)new_wxSizeEvent(*_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxSizeEvent_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxSizeEvent_GetSize(_swigobj) (_swigobj->GetSize()) +static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxSizeEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizeEvent_GetSize",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizeEvent_GetSize. Expected _wxSizeEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxSize (wxSizeEvent_GetSize(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxSizeEvent_GetRect(_swigobj) (_swigobj->GetRect()) +static PyObject *_wrap_wxSizeEvent_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxRect * _result; + wxSizeEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizeEvent_GetRect",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizeEvent_GetRect. Expected _wxSizeEvent_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSizeEvent *)new_wxSizeEvent(*_arg0,_arg1); + _result = new wxRect (wxSizeEvent_GetRect(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxSizeEvent_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxSizeEvent_GetSize(_swigobj) (_swigobj->GetSize()) -static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxSizeEvent_SetRect(_swigobj,_swigarg0) (_swigobj->SetRect(_swigarg0)) +static PyObject *_wrap_wxSizeEvent_SetRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxSize * _result; wxSizeEvent * _arg0; + wxRect * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + wxRect temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizeEvent_GetSize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizeEvent_SetRect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizeEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizeEvent_GetSize. Expected _wxSizeEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizeEvent_SetRect. Expected _wxSizeEvent_p."); return NULL; } } +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxSize (wxSizeEvent_GetSize(_arg0)); + wxSizeEvent_SetRect(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); - _resultobj = Py_BuildValue("s",_ptemp); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } @@ -4697,6 +5000,72 @@ static PyObject *_wrap_wxMoveEvent_GetPosition(PyObject *self, PyObject *args, P return _resultobj; } +#define wxMoveEvent_GetRect(_swigobj) (_swigobj->GetRect()) +static PyObject *_wrap_wxMoveEvent_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxRect * _result; + wxMoveEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMoveEvent_GetRect",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMoveEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMoveEvent_GetRect. Expected _wxMoveEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxRect (wxMoveEvent_GetRect(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxMoveEvent_SetRect(_swigobj,_swigarg0) (_swigobj->SetRect(_swigarg0)) +static PyObject *_wrap_wxMoveEvent_SetRect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMoveEvent * _arg0; + wxRect * _arg1; + PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","rect", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMoveEvent_SetRect",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMoveEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMoveEvent_SetRect. Expected _wxMoveEvent_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxMoveEvent_SetRect(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxPaintEventTowxEvent(void *ptr) { wxPaintEvent *src; wxEvent *dest; @@ -4840,13 +5209,13 @@ static void *SwigwxFocusEventTowxObject(void *ptr) { static PyObject *_wrap_new_wxFocusEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFocusEvent * _result; - WXTYPE _arg0 = (WXTYPE ) 0; + int _arg0 = (int ) 0; int _arg1 = (int ) 0; char *_kwnames[] = { "eventType","id", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|hi:new_wxFocusEvent",_kwnames,&_arg0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxFocusEvent",_kwnames,&_arg0,&_arg1)) return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4971,14 +5340,14 @@ static void *SwigwxActivateEventTowxObject(void *ptr) { static PyObject *_wrap_new_wxActivateEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxActivateEvent * _result; - WXTYPE _arg0 = (WXTYPE ) 0; + int _arg0 = (int ) 0; int _arg1 = (int ) TRUE; int _arg2 = (int ) 0; char *_kwnames[] = { "eventType","active","id", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|hii:new_wxActivateEvent",_kwnames,&_arg0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iii:new_wxActivateEvent",_kwnames,&_arg0,&_arg1,&_arg2)) return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5083,21 +5452,30 @@ static void *SwigwxMenuEventTowxObject(void *ptr) { return (void *) dest; } -#define new_wxMenuEvent(_swigarg0,_swigarg1) (new wxMenuEvent(_swigarg0,_swigarg1)) +#define new_wxMenuEvent(_swigarg0,_swigarg1,_swigarg2) (new wxMenuEvent(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_new_wxMenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMenuEvent * _result; - WXTYPE _arg0 = (WXTYPE ) 0; + int _arg0 = (int ) 0; int _arg1 = (int ) 0; - char *_kwnames[] = { "id","id", NULL }; + wxMenu * _arg2 = (wxMenu *) NULL; + PyObject * _argo2 = 0; + char *_kwnames[] = { "id","winid","menu", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|hi:new_wxMenuEvent",_kwnames,&_arg0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiO:new_wxMenuEvent",_kwnames,&_arg0,&_arg1,&_argo2)) return NULL; + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxMenuEvent. Expected _wxMenu_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxMenuEvent *)new_wxMenuEvent(_arg0,_arg1); + _result = (wxMenuEvent *)new_wxMenuEvent(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5167,6 +5545,34 @@ static PyObject *_wrap_wxMenuEvent_IsPopup(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxMenuEvent_GetMenu(_swigobj) (_swigobj->GetMenu()) +static PyObject *_wrap_wxMenuEvent_GetMenu(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenu * _result; + wxMenuEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuEvent_GetMenu",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuEvent_GetMenu. Expected _wxMenuEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxMenu *)wxMenuEvent_GetMenu(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + static void *SwigwxShowEventTowxEvent(void *ptr) { wxShowEvent *src; wxEvent *dest; @@ -6121,6 +6527,70 @@ static PyObject *_wrap_wxIdleEvent_MoreRequested(PyObject *self, PyObject *args, return _resultobj; } +static PyObject *_wrap_wxIdleEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIdleMode _arg0; + char *_kwnames[] = { "mode", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxIdleEvent_SetMode",_kwnames,&_arg0)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxIdleEvent::SetMode(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxIdleEvent_GetMode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIdleMode _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxIdleEvent_GetMode",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxIdleMode )wxIdleEvent::GetMode(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxIdleEvent_CanSend(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "win", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIdleEvent_CanSend",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIdleEvent_CanSend. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxIdleEvent::CanSend(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxUpdateUIEventTowxEvent(void *ptr) { wxUpdateUIEvent *src; wxEvent *dest; @@ -6442,6 +6912,125 @@ static PyObject *_wrap_wxUpdateUIEvent_SetText(PyObject *self, PyObject *args, P return _resultobj; } +static PyObject *_wrap_wxUpdateUIEvent_SetUpdateInterval(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _arg0; + char *_kwnames[] = { "updateInterval", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxUpdateUIEvent_SetUpdateInterval",_kwnames,&_arg0)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxUpdateUIEvent::SetUpdateInterval(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxUpdateUIEvent_GetUpdateInterval(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxUpdateUIEvent_GetUpdateInterval",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (long )wxUpdateUIEvent::GetUpdateInterval(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +static PyObject *_wrap_wxUpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "win", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxUpdateUIEvent_CanUpdate",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxUpdateUIEvent_CanUpdate. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxUpdateUIEvent::CanUpdate(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxUpdateUIEvent_ResetUpdateTime(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxUpdateUIEvent_ResetUpdateTime",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxUpdateUIEvent::ResetUpdateTime(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxUpdateUIEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxUpdateUIMode _arg0; + char *_kwnames[] = { "mode", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxUpdateUIEvent_SetMode",_kwnames,&_arg0)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxUpdateUIEvent::SetMode(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxUpdateUIEvent_GetMode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxUpdateUIMode _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxUpdateUIEvent_GetMode",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxUpdateUIMode )wxUpdateUIEvent::GetMode(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxSysColourChangedEventTowxEvent(void *ptr) { wxSysColourChangedEvent *src; wxEvent *dest; @@ -7413,20 +8002,21 @@ static void *SwigwxPyEventTowxObject(void *ptr) { return (void *) dest; } -#define new_wxPyEvent(_swigarg0) (new wxPyEvent(_swigarg0)) +#define new_wxPyEvent(_swigarg0,_swigarg1) (new wxPyEvent(_swigarg0,_swigarg1)) static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyEvent * _result; int _arg0 = (int ) 0; - char *_kwnames[] = { "id", NULL }; + wxEventType _arg1 = (wxEventType ) wxEVT_NULL; + char *_kwnames[] = { "winid","commandType", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|i:new_wxPyEvent",_kwnames,&_arg0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:new_wxPyEvent",_kwnames,&_arg0,&_arg1)) return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPyEvent *)new_wxPyEvent(_arg0); + _result = (wxPyEvent *)new_wxPyEvent(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -7708,6 +8298,12 @@ static PyMethodDef eventscMethods[] = { { "wxNotifyEvent_IsAllowed", (PyCFunction) _wrap_wxNotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS }, { "new_wxNotifyEvent", (PyCFunction) _wrap_new_wxNotifyEvent, METH_VARARGS | METH_KEYWORDS }, { "new_wxSysColourChangedEvent", (PyCFunction) _wrap_new_wxSysColourChangedEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxUpdateUIEvent_GetMode", (PyCFunction) _wrap_wxUpdateUIEvent_GetMode, METH_VARARGS | METH_KEYWORDS }, + { "wxUpdateUIEvent_SetMode", (PyCFunction) _wrap_wxUpdateUIEvent_SetMode, METH_VARARGS | METH_KEYWORDS }, + { "wxUpdateUIEvent_ResetUpdateTime", (PyCFunction) _wrap_wxUpdateUIEvent_ResetUpdateTime, METH_VARARGS | METH_KEYWORDS }, + { "wxUpdateUIEvent_CanUpdate", (PyCFunction) _wrap_wxUpdateUIEvent_CanUpdate, METH_VARARGS | METH_KEYWORDS }, + { "wxUpdateUIEvent_GetUpdateInterval", (PyCFunction) _wrap_wxUpdateUIEvent_GetUpdateInterval, METH_VARARGS | METH_KEYWORDS }, + { "wxUpdateUIEvent_SetUpdateInterval", (PyCFunction) _wrap_wxUpdateUIEvent_SetUpdateInterval, METH_VARARGS | METH_KEYWORDS }, { "wxUpdateUIEvent_SetText", (PyCFunction) _wrap_wxUpdateUIEvent_SetText, METH_VARARGS | METH_KEYWORDS }, { "wxUpdateUIEvent_Enable", (PyCFunction) _wrap_wxUpdateUIEvent_Enable, METH_VARARGS | METH_KEYWORDS }, { "wxUpdateUIEvent_Check", (PyCFunction) _wrap_wxUpdateUIEvent_Check, METH_VARARGS | METH_KEYWORDS }, @@ -7718,6 +8314,9 @@ static PyMethodDef eventscMethods[] = { { "wxUpdateUIEvent_GetEnabled", (PyCFunction) _wrap_wxUpdateUIEvent_GetEnabled, METH_VARARGS | METH_KEYWORDS }, { "wxUpdateUIEvent_GetChecked", (PyCFunction) _wrap_wxUpdateUIEvent_GetChecked, METH_VARARGS | METH_KEYWORDS }, { "new_wxUpdateUIEvent", (PyCFunction) _wrap_new_wxUpdateUIEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxIdleEvent_CanSend", (PyCFunction) _wrap_wxIdleEvent_CanSend, METH_VARARGS | METH_KEYWORDS }, + { "wxIdleEvent_GetMode", (PyCFunction) _wrap_wxIdleEvent_GetMode, METH_VARARGS | METH_KEYWORDS }, + { "wxIdleEvent_SetMode", (PyCFunction) _wrap_wxIdleEvent_SetMode, METH_VARARGS | METH_KEYWORDS }, { "wxIdleEvent_MoreRequested", (PyCFunction) _wrap_wxIdleEvent_MoreRequested, METH_VARARGS | METH_KEYWORDS }, { "wxIdleEvent_RequestMore", (PyCFunction) _wrap_wxIdleEvent_RequestMore, METH_VARARGS | METH_KEYWORDS }, { "new_wxIdleEvent", (PyCFunction) _wrap_new_wxIdleEvent, METH_VARARGS | METH_KEYWORDS }, @@ -7747,6 +8346,7 @@ static PyMethodDef eventscMethods[] = { { "wxShowEvent_GetShow", (PyCFunction) _wrap_wxShowEvent_GetShow, METH_VARARGS | METH_KEYWORDS }, { "wxShowEvent_SetShow", (PyCFunction) _wrap_wxShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS }, { "new_wxShowEvent", (PyCFunction) _wrap_new_wxShowEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuEvent_GetMenu", (PyCFunction) _wrap_wxMenuEvent_GetMenu, METH_VARARGS | METH_KEYWORDS }, { "wxMenuEvent_IsPopup", (PyCFunction) _wrap_wxMenuEvent_IsPopup, METH_VARARGS | METH_KEYWORDS }, { "wxMenuEvent_GetMenuId", (PyCFunction) _wrap_wxMenuEvent_GetMenuId, METH_VARARGS | METH_KEYWORDS }, { "new_wxMenuEvent", (PyCFunction) _wrap_new_wxMenuEvent, METH_VARARGS | METH_KEYWORDS }, @@ -7759,6 +8359,8 @@ static PyMethodDef eventscMethods[] = { { "wxEraseEvent_GetDC", (PyCFunction) _wrap_wxEraseEvent_GetDC, METH_VARARGS | METH_KEYWORDS }, { "new_wxEraseEvent", (PyCFunction) _wrap_new_wxEraseEvent, METH_VARARGS | METH_KEYWORDS }, { "new_wxPaintEvent", (PyCFunction) _wrap_new_wxPaintEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxMoveEvent_SetRect", (PyCFunction) _wrap_wxMoveEvent_SetRect, METH_VARARGS | METH_KEYWORDS }, + { "wxMoveEvent_GetRect", (PyCFunction) _wrap_wxMoveEvent_GetRect, METH_VARARGS | METH_KEYWORDS }, { "wxMoveEvent_GetPosition", (PyCFunction) _wrap_wxMoveEvent_GetPosition, METH_VARARGS | METH_KEYWORDS }, { "new_wxMoveEvent", (PyCFunction) _wrap_new_wxMoveEvent, METH_VARARGS | METH_KEYWORDS }, { "wxNavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_wxNavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS }, @@ -7894,16 +8496,26 @@ static PyMethodDef eventscMethods[] = { { "wxCloseEvent_GetLoggingOff", (PyCFunction) _wrap_wxCloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS }, { "wxCloseEvent_SetLoggingOff", (PyCFunction) _wrap_wxCloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS }, { "new_wxCloseEvent", (PyCFunction) _wrap_new_wxCloseEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxSizeEvent_SetRect", (PyCFunction) _wrap_wxSizeEvent_SetRect, METH_VARARGS | METH_KEYWORDS }, + { "wxSizeEvent_GetRect", (PyCFunction) _wrap_wxSizeEvent_GetRect, METH_VARARGS | METH_KEYWORDS }, { "wxSizeEvent_GetSize", (PyCFunction) _wrap_wxSizeEvent_GetSize, METH_VARARGS | METH_KEYWORDS }, { "new_wxSizeEvent", (PyCFunction) _wrap_new_wxSizeEvent, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxPropagateOnce", (PyCFunction) _wrap_delete_wxPropagateOnce, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPropagateOnce", (PyCFunction) _wrap_new_wxPropagateOnce, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxPropagationDisabler", (PyCFunction) _wrap_delete_wxPropagationDisabler, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPropagationDisabler", (PyCFunction) _wrap_new_wxPropagationDisabler, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_Clone", (PyCFunction) _wrap_wxEvent_Clone, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_ResumePropagation", (PyCFunction) _wrap_wxEvent_ResumePropagation, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_StopPropagation", (PyCFunction) _wrap_wxEvent_StopPropagation, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_ShouldPropagate", (PyCFunction) _wrap_wxEvent_ShouldPropagate, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_GetSkipped", (PyCFunction) _wrap_wxEvent_GetSkipped, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_Skip", (PyCFunction) _wrap_wxEvent_Skip, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_IsCommandEvent", (PyCFunction) _wrap_wxEvent_IsCommandEvent, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_SetTimestamp", (PyCFunction) _wrap_wxEvent_SetTimestamp, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_SetId", (PyCFunction) _wrap_wxEvent_SetId, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_SetEventType", (PyCFunction) _wrap_wxEvent_SetEventType, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_SetEventObject", (PyCFunction) _wrap_wxEvent_SetEventObject, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_GetTimestamp", (PyCFunction) _wrap_wxEvent_GetTimestamp, METH_VARARGS | METH_KEYWORDS }, - { "wxEvent_GetSkipped", (PyCFunction) _wrap_wxEvent_GetSkipped, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_GetId", (PyCFunction) _wrap_wxEvent_GetId, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_GetEventType", (PyCFunction) _wrap_wxEvent_GetEventType, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_GetEventObject", (PyCFunction) _wrap_wxEvent_GetEventObject, METH_VARARGS | METH_KEYWORDS }, @@ -8110,6 +8722,12 @@ SWIGEXPORT(void) initeventsc() { SWIG_globals = SWIG_newvarlink(); m = Py_InitModule("eventsc", eventscMethods); d = PyModule_GetDict(m); + PyDict_SetItemString(d,"wxEVENT_PROPAGATE_NONE", PyInt_FromLong((long) wxEVENT_PROPAGATE_NONE)); + PyDict_SetItemString(d,"wxEVENT_PROPAGATE_MAX", PyInt_FromLong((long) wxEVENT_PROPAGATE_MAX)); + PyDict_SetItemString(d,"wxIDLE_PROCESS_ALL", PyInt_FromLong((long) wxIDLE_PROCESS_ALL)); + PyDict_SetItemString(d,"wxIDLE_PROCESS_SPECIFIED", PyInt_FromLong((long) wxIDLE_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"wxUPDATE_UI_PROCESS_ALL", PyInt_FromLong((long) wxUPDATE_UI_PROCESS_ALL)); + PyDict_SetItemString(d,"wxUPDATE_UI_PROCESS_SPECIFIED", PyInt_FromLong((long) wxUPDATE_UI_PROCESS_SPECIFIED)); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/wxPython/src/msw/events.py b/wxPython/src/msw/events.py index 3f52c08034..3505d67a41 100644 --- a/wxPython/src/msw/events.py +++ b/wxPython/src/msw/events.py @@ -17,41 +17,53 @@ class wxEventPtr(wxObjectPtr): except: pass def GetEventObject(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_GetEventObject,(self,) + _args, _kwargs) + val = eventsc.wxEvent_GetEventObject(self, *_args, **_kwargs) return val def GetEventType(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_GetEventType,(self,) + _args, _kwargs) + val = eventsc.wxEvent_GetEventType(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_GetId,(self,) + _args, _kwargs) - return val - def GetSkipped(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_GetSkipped,(self,) + _args, _kwargs) + val = eventsc.wxEvent_GetId(self, *_args, **_kwargs) return val def GetTimestamp(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_GetTimestamp,(self,) + _args, _kwargs) + val = eventsc.wxEvent_GetTimestamp(self, *_args, **_kwargs) return val def SetEventObject(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_SetEventObject,(self,) + _args, _kwargs) + val = eventsc.wxEvent_SetEventObject(self, *_args, **_kwargs) return val def SetEventType(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_SetEventType,(self,) + _args, _kwargs) + val = eventsc.wxEvent_SetEventType(self, *_args, **_kwargs) return val def SetId(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_SetId,(self,) + _args, _kwargs) + val = eventsc.wxEvent_SetId(self, *_args, **_kwargs) return val def SetTimestamp(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_SetTimestamp,(self,) + _args, _kwargs) + val = eventsc.wxEvent_SetTimestamp(self, *_args, **_kwargs) + return val + def IsCommandEvent(self, *_args, **_kwargs): + val = eventsc.wxEvent_IsCommandEvent(self, *_args, **_kwargs) return val def Skip(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_Skip,(self,) + _args, _kwargs) + val = eventsc.wxEvent_Skip(self, *_args, **_kwargs) + return val + def GetSkipped(self, *_args, **_kwargs): + val = eventsc.wxEvent_GetSkipped(self, *_args, **_kwargs) + return val + def ShouldPropagate(self, *_args, **_kwargs): + val = eventsc.wxEvent_ShouldPropagate(self, *_args, **_kwargs) + return val + def StopPropagation(self, *_args, **_kwargs): + val = eventsc.wxEvent_StopPropagation(self, *_args, **_kwargs) + return val + def ResumePropagation(self, *_args, **_kwargs): + val = eventsc.wxEvent_ResumePropagation(self, *_args, **_kwargs) return val def Clone(self, *_args, **_kwargs): - val = apply(eventsc.wxEvent_Clone,(self,) + _args, _kwargs) + val = eventsc.wxEvent_Clone(self, *_args, **_kwargs) if val: val = wxEventPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxEvent(wxEventPtr): def __init__(self,this): self.this = this @@ -59,19 +71,66 @@ class wxEvent(wxEventPtr): +class wxPropagationDisablerPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=eventsc.delete_wxPropagationDisabler): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPropagationDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPropagationDisabler(wxPropagationDisablerPtr): + def __init__(self,*_args,**_kwargs): + self.this = eventsc.new_wxPropagationDisabler(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxPropagateOncePtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=eventsc.delete_wxPropagateOnce): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPropagateOnce instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPropagateOnce(wxPropagateOncePtr): + def __init__(self,*_args,**_kwargs): + self.this = eventsc.new_wxPropagateOnce(*_args,**_kwargs) + self.thisown = 1 + + + + class wxSizeEventPtr(wxEventPtr): def __init__(self,this): self.this = this self.thisown = 0 def GetSize(self, *_args, **_kwargs): - val = apply(eventsc.wxSizeEvent_GetSize,(self,) + _args, _kwargs) + val = eventsc.wxSizeEvent_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val + def GetRect(self, *_args, **_kwargs): + val = eventsc.wxSizeEvent_GetRect(self, *_args, **_kwargs) + if val: val = wxRectPtr(val) ; val.thisown = 1 + return val + def SetRect(self, *_args, **_kwargs): + val = eventsc.wxSizeEvent_SetRect(self, *_args, **_kwargs) + return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSizeEvent(wxSizeEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxSizeEvent,_args,_kwargs) + self.this = eventsc.new_wxSizeEvent(*_args,**_kwargs) self.thisown = 1 @@ -82,28 +141,28 @@ class wxCloseEventPtr(wxEventPtr): self.this = this self.thisown = 0 def SetLoggingOff(self, *_args, **_kwargs): - val = apply(eventsc.wxCloseEvent_SetLoggingOff,(self,) + _args, _kwargs) + val = eventsc.wxCloseEvent_SetLoggingOff(self, *_args, **_kwargs) return val def GetLoggingOff(self, *_args, **_kwargs): - val = apply(eventsc.wxCloseEvent_GetLoggingOff,(self,) + _args, _kwargs) + val = eventsc.wxCloseEvent_GetLoggingOff(self, *_args, **_kwargs) return val def Veto(self, *_args, **_kwargs): - val = apply(eventsc.wxCloseEvent_Veto,(self,) + _args, _kwargs) + val = eventsc.wxCloseEvent_Veto(self, *_args, **_kwargs) return val def CanVeto(self, *_args, **_kwargs): - val = apply(eventsc.wxCloseEvent_CanVeto,(self,) + _args, _kwargs) + val = eventsc.wxCloseEvent_CanVeto(self, *_args, **_kwargs) return val def GetVeto(self, *_args, **_kwargs): - val = apply(eventsc.wxCloseEvent_GetVeto,(self,) + _args, _kwargs) + val = eventsc.wxCloseEvent_GetVeto(self, *_args, **_kwargs) return val def SetCanVeto(self, *_args, **_kwargs): - val = apply(eventsc.wxCloseEvent_SetCanVeto,(self,) + _args, _kwargs) + val = eventsc.wxCloseEvent_SetCanVeto(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCloseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCloseEvent(wxCloseEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxCloseEvent,_args,_kwargs) + self.this = eventsc.new_wxCloseEvent(*_args,**_kwargs) self.thisown = 1 @@ -114,43 +173,43 @@ class wxCommandEventPtr(wxEventPtr): self.this = this self.thisown = 0 def IsChecked(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_IsChecked,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_IsChecked(self, *_args, **_kwargs) return val def Checked(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_Checked,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_Checked(self, *_args, **_kwargs) return val def GetExtraLong(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_GetExtraLong,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_GetExtraLong(self, *_args, **_kwargs) return val def GetInt(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_GetInt,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_GetInt(self, *_args, **_kwargs) return val def GetSelection(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_GetSelection,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_GetSelection(self, *_args, **_kwargs) return val def GetString(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_GetString,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_GetString(self, *_args, **_kwargs) return val def IsSelection(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_IsSelection,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_IsSelection(self, *_args, **_kwargs) return val def SetString(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_SetString,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_SetString(self, *_args, **_kwargs) return val def SetExtraLong(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_SetExtraLong,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_SetExtraLong(self, *_args, **_kwargs) return val def SetInt(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_SetInt,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_SetInt(self, *_args, **_kwargs) return val def GetClientData(self, *_args, **_kwargs): - val = apply(eventsc.wxCommandEvent_GetClientData,(self,) + _args, _kwargs) + val = eventsc.wxCommandEvent_GetClientData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCommandEvent(wxCommandEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxCommandEvent,_args,_kwargs) + self.this = eventsc.new_wxCommandEvent(*_args,**_kwargs) self.thisown = 1 @@ -161,16 +220,16 @@ class wxScrollEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetOrientation(self, *_args, **_kwargs): - val = apply(eventsc.wxScrollEvent_GetOrientation,(self,) + _args, _kwargs) + val = eventsc.wxScrollEvent_GetOrientation(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxScrollEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxScrollEvent_GetPosition(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxScrollEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxScrollEvent(wxScrollEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxScrollEvent,_args,_kwargs) + self.this = eventsc.new_wxScrollEvent(*_args,**_kwargs) self.thisown = 1 @@ -181,16 +240,16 @@ class wxScrollWinEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetOrientation(self, *_args, **_kwargs): - val = apply(eventsc.wxScrollWinEvent_GetOrientation,(self,) + _args, _kwargs) + val = eventsc.wxScrollWinEvent_GetOrientation(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxScrollWinEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxScrollWinEvent_GetPosition(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxScrollWinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxScrollWinEvent(wxScrollWinEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxScrollWinEvent,_args,_kwargs) + self.this = eventsc.new_wxScrollWinEvent(*_args,**_kwargs) self.thisown = 1 @@ -201,10 +260,10 @@ class wxSpinEventPtr(wxScrollEventPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSpinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSpinEvent(wxSpinEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxSpinEvent,_args,_kwargs) + self.this = eventsc.new_wxSpinEvent(*_args,**_kwargs) self.thisown = 1 @@ -215,108 +274,108 @@ class wxMouseEventPtr(wxEventPtr): self.this = this self.thisown = 0 def IsButton(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_IsButton,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_IsButton(self, *_args, **_kwargs) return val def ButtonDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_ButtonDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_ButtonDown(self, *_args, **_kwargs) return val def ButtonDClick(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_ButtonDClick,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_ButtonDClick(self, *_args, **_kwargs) return val def ButtonUp(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_ButtonUp,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_ButtonUp(self, *_args, **_kwargs) return val def Button(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_Button,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_Button(self, *_args, **_kwargs) return val def ButtonIsDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_ButtonIsDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_ButtonIsDown(self, *_args, **_kwargs) return val def ControlDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_ControlDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_ControlDown(self, *_args, **_kwargs) return val def MetaDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_MetaDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_MetaDown(self, *_args, **_kwargs) return val def AltDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_AltDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_AltDown(self, *_args, **_kwargs) return val def ShiftDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_ShiftDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_ShiftDown(self, *_args, **_kwargs) return val def LeftDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_LeftDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_LeftDown(self, *_args, **_kwargs) return val def MiddleDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_MiddleDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_MiddleDown(self, *_args, **_kwargs) return val def RightDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_RightDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_RightDown(self, *_args, **_kwargs) return val def LeftUp(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_LeftUp,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_LeftUp(self, *_args, **_kwargs) return val def MiddleUp(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_MiddleUp,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_MiddleUp(self, *_args, **_kwargs) return val def RightUp(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_RightUp,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_RightUp(self, *_args, **_kwargs) return val def LeftDClick(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_LeftDClick,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_LeftDClick(self, *_args, **_kwargs) return val def MiddleDClick(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_MiddleDClick,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_MiddleDClick(self, *_args, **_kwargs) return val def RightDClick(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_RightDClick,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_RightDClick(self, *_args, **_kwargs) return val def LeftIsDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_LeftIsDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_LeftIsDown(self, *_args, **_kwargs) return val def MiddleIsDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_MiddleIsDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_MiddleIsDown(self, *_args, **_kwargs) return val def RightIsDown(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_RightIsDown,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_RightIsDown(self, *_args, **_kwargs) return val def Dragging(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_Dragging,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_Dragging(self, *_args, **_kwargs) return val def Moving(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_Moving,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_Moving(self, *_args, **_kwargs) return val def Entering(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_Entering,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_Entering(self, *_args, **_kwargs) return val def Leaving(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_Leaving,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_Leaving(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetPositionTuple(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetPositionTuple,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetPositionTuple(self, *_args, **_kwargs) return val def GetLogicalPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetLogicalPosition,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetLogicalPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetX(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetX,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetX(self, *_args, **_kwargs) return val def GetY(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetY,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetY(self, *_args, **_kwargs) return val def GetWheelRotation(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetWheelRotation,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetWheelRotation(self, *_args, **_kwargs) return val def GetWheelDelta(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetWheelDelta,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetWheelDelta(self, *_args, **_kwargs) return val def GetLinesPerAction(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseEvent_GetLinesPerAction,(self,) + _args, _kwargs) + val = eventsc.wxMouseEvent_GetLinesPerAction(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "m_x" : @@ -383,10 +442,10 @@ class wxMouseEventPtr(wxEventPtr): return eventsc.wxMouseEvent_m_linesPerAction_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMouseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMouseEvent(wxMouseEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxMouseEvent,_args,_kwargs) + self.this = eventsc.new_wxMouseEvent(*_args,**_kwargs) self.thisown = 1 @@ -397,13 +456,13 @@ class wxMouseCaptureChangedEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetCapturedWindow(self, *_args, **_kwargs): - val = apply(eventsc.wxMouseCaptureChangedEvent_GetCapturedWindow,(self,) + _args, _kwargs) + val = eventsc.wxMouseCaptureChangedEvent_GetCapturedWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMouseCaptureChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMouseCaptureChangedEvent(wxMouseCaptureChangedEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxMouseCaptureChangedEvent,_args,_kwargs) + self.this = eventsc.new_wxMouseCaptureChangedEvent(*_args,**_kwargs) self.thisown = 1 @@ -414,26 +473,26 @@ class wxSetCursorEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetX(self, *_args, **_kwargs): - val = apply(eventsc.wxSetCursorEvent_GetX,(self,) + _args, _kwargs) + val = eventsc.wxSetCursorEvent_GetX(self, *_args, **_kwargs) return val def GetY(self, *_args, **_kwargs): - val = apply(eventsc.wxSetCursorEvent_GetY,(self,) + _args, _kwargs) + val = eventsc.wxSetCursorEvent_GetY(self, *_args, **_kwargs) return val def SetCursor(self, *_args, **_kwargs): - val = apply(eventsc.wxSetCursorEvent_SetCursor,(self,) + _args, _kwargs) + val = eventsc.wxSetCursorEvent_SetCursor(self, *_args, **_kwargs) return val def GetCursor(self, *_args, **_kwargs): - val = apply(eventsc.wxSetCursorEvent_GetCursor,(self,) + _args, _kwargs) + val = eventsc.wxSetCursorEvent_GetCursor(self, *_args, **_kwargs) if val: val = wxCursorPtr(val) return val def HasCursor(self, *_args, **_kwargs): - val = apply(eventsc.wxSetCursorEvent_HasCursor,(self,) + _args, _kwargs) + val = eventsc.wxSetCursorEvent_HasCursor(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSetCursorEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSetCursorEvent(wxSetCursorEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxSetCursorEvent,_args,_kwargs) + self.this = eventsc.new_wxSetCursorEvent(*_args,**_kwargs) self.thisown = 1 @@ -444,41 +503,41 @@ class wxKeyEventPtr(wxEventPtr): self.this = this self.thisown = 0 def ControlDown(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_ControlDown,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_ControlDown(self, *_args, **_kwargs) return val def MetaDown(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_MetaDown,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_MetaDown(self, *_args, **_kwargs) return val def AltDown(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_AltDown,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_AltDown(self, *_args, **_kwargs) return val def ShiftDown(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_ShiftDown,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_ShiftDown(self, *_args, **_kwargs) return val def GetKeyCode(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_GetKeyCode,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_GetKeyCode(self, *_args, **_kwargs) return val def HasModifiers(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_HasModifiers,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_HasModifiers(self, *_args, **_kwargs) return val def GetRawKeyCode(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_GetRawKeyCode,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_GetRawKeyCode(self, *_args, **_kwargs) return val def GetRawKeyFlags(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_GetRawKeyFlags,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_GetRawKeyFlags(self, *_args, **_kwargs) return val def GetX(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_GetX,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_GetX(self, *_args, **_kwargs) return val def GetY(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_GetY,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_GetY(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetPositionTuple(self, *_args, **_kwargs): - val = apply(eventsc.wxKeyEvent_GetPositionTuple,(self,) + _args, _kwargs) + val = eventsc.wxKeyEvent_GetPositionTuple(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "m_x" : @@ -535,11 +594,11 @@ class wxKeyEventPtr(wxEventPtr): return eventsc.wxKeyEvent_m_rawFlags_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) KeyCode = GetKeyCode class wxKeyEvent(wxKeyEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxKeyEvent,_args,_kwargs) + self.this = eventsc.new_wxKeyEvent(*_args,**_kwargs) self.thisown = 1 @@ -550,28 +609,28 @@ class wxNavigationKeyEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetDirection(self, *_args, **_kwargs): - val = apply(eventsc.wxNavigationKeyEvent_GetDirection,(self,) + _args, _kwargs) + val = eventsc.wxNavigationKeyEvent_GetDirection(self, *_args, **_kwargs) return val def SetDirection(self, *_args, **_kwargs): - val = apply(eventsc.wxNavigationKeyEvent_SetDirection,(self,) + _args, _kwargs) + val = eventsc.wxNavigationKeyEvent_SetDirection(self, *_args, **_kwargs) return val def IsWindowChange(self, *_args, **_kwargs): - val = apply(eventsc.wxNavigationKeyEvent_IsWindowChange,(self,) + _args, _kwargs) + val = eventsc.wxNavigationKeyEvent_IsWindowChange(self, *_args, **_kwargs) return val def SetWindowChange(self, *_args, **_kwargs): - val = apply(eventsc.wxNavigationKeyEvent_SetWindowChange,(self,) + _args, _kwargs) + val = eventsc.wxNavigationKeyEvent_SetWindowChange(self, *_args, **_kwargs) return val def GetCurrentFocus(self, *_args, **_kwargs): - val = apply(eventsc.wxNavigationKeyEvent_GetCurrentFocus,(self,) + _args, _kwargs) + val = eventsc.wxNavigationKeyEvent_GetCurrentFocus(self, *_args, **_kwargs) return val def SetCurrentFocus(self, *_args, **_kwargs): - val = apply(eventsc.wxNavigationKeyEvent_SetCurrentFocus,(self,) + _args, _kwargs) + val = eventsc.wxNavigationKeyEvent_SetCurrentFocus(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxNavigationKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxNavigationKeyEvent(wxNavigationKeyEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxNavigationKeyEvent,_args,_kwargs) + self.this = eventsc.new_wxNavigationKeyEvent(*_args,**_kwargs) self.thisown = 1 @@ -582,14 +641,21 @@ class wxMoveEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxMoveEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxMoveEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val + def GetRect(self, *_args, **_kwargs): + val = eventsc.wxMoveEvent_GetRect(self, *_args, **_kwargs) + if val: val = wxRectPtr(val) ; val.thisown = 1 + return val + def SetRect(self, *_args, **_kwargs): + val = eventsc.wxMoveEvent_SetRect(self, *_args, **_kwargs) + return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMoveEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMoveEvent(wxMoveEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxMoveEvent,_args,_kwargs) + self.this = eventsc.new_wxMoveEvent(*_args,**_kwargs) self.thisown = 1 @@ -600,10 +666,10 @@ class wxPaintEventPtr(wxEventPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPaintEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPaintEvent(wxPaintEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxPaintEvent,_args,_kwargs) + self.this = eventsc.new_wxPaintEvent(*_args,**_kwargs) self.thisown = 1 @@ -614,13 +680,13 @@ class wxEraseEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetDC(self, *_args, **_kwargs): - val = apply(eventsc.wxEraseEvent_GetDC,(self,) + _args, _kwargs) + val = eventsc.wxEraseEvent_GetDC(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxEraseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxEraseEvent(wxEraseEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxEraseEvent,_args,_kwargs) + self.this = eventsc.new_wxEraseEvent(*_args,**_kwargs) self.thisown = 1 @@ -631,10 +697,10 @@ class wxFocusEventPtr(wxEventPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFocusEvent(wxFocusEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxFocusEvent,_args,_kwargs) + self.this = eventsc.new_wxFocusEvent(*_args,**_kwargs) self.thisown = 1 @@ -645,13 +711,13 @@ class wxChildFocusEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetWindow(self, *_args, **_kwargs): - val = apply(eventsc.wxChildFocusEvent_GetWindow,(self,) + _args, _kwargs) + val = eventsc.wxChildFocusEvent_GetWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxChildFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxChildFocusEvent(wxChildFocusEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxChildFocusEvent,_args,_kwargs) + self.this = eventsc.new_wxChildFocusEvent(*_args,**_kwargs) self.thisown = 1 @@ -662,13 +728,13 @@ class wxActivateEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetActive(self, *_args, **_kwargs): - val = apply(eventsc.wxActivateEvent_GetActive,(self,) + _args, _kwargs) + val = eventsc.wxActivateEvent_GetActive(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxActivateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxActivateEvent(wxActivateEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxActivateEvent,_args,_kwargs) + self.this = eventsc.new_wxActivateEvent(*_args,**_kwargs) self.thisown = 1 @@ -679,10 +745,10 @@ class wxInitDialogEventPtr(wxEventPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxInitDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxInitDialogEvent(wxInitDialogEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxInitDialogEvent,_args,_kwargs) + self.this = eventsc.new_wxInitDialogEvent(*_args,**_kwargs) self.thisown = 1 @@ -693,16 +759,19 @@ class wxMenuEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetMenuId(self, *_args, **_kwargs): - val = apply(eventsc.wxMenuEvent_GetMenuId,(self,) + _args, _kwargs) + val = eventsc.wxMenuEvent_GetMenuId(self, *_args, **_kwargs) return val def IsPopup(self, *_args, **_kwargs): - val = apply(eventsc.wxMenuEvent_IsPopup,(self,) + _args, _kwargs) + val = eventsc.wxMenuEvent_IsPopup(self, *_args, **_kwargs) + return val + def GetMenu(self, *_args, **_kwargs): + val = eventsc.wxMenuEvent_GetMenu(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMenuEvent(wxMenuEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxMenuEvent,_args,_kwargs) + self.this = eventsc.new_wxMenuEvent(*_args,**_kwargs) self.thisown = 1 @@ -713,16 +782,16 @@ class wxShowEventPtr(wxEventPtr): self.this = this self.thisown = 0 def SetShow(self, *_args, **_kwargs): - val = apply(eventsc.wxShowEvent_SetShow,(self,) + _args, _kwargs) + val = eventsc.wxShowEvent_SetShow(self, *_args, **_kwargs) return val def GetShow(self, *_args, **_kwargs): - val = apply(eventsc.wxShowEvent_GetShow,(self,) + _args, _kwargs) + val = eventsc.wxShowEvent_GetShow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxShowEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxShowEvent(wxShowEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxShowEvent,_args,_kwargs) + self.this = eventsc.new_wxShowEvent(*_args,**_kwargs) self.thisown = 1 @@ -733,13 +802,13 @@ class wxIconizeEventPtr(wxEventPtr): self.this = this self.thisown = 0 def Iconized(self, *_args, **_kwargs): - val = apply(eventsc.wxIconizeEvent_Iconized,(self,) + _args, _kwargs) + val = eventsc.wxIconizeEvent_Iconized(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxIconizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxIconizeEvent(wxIconizeEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxIconizeEvent,_args,_kwargs) + self.this = eventsc.new_wxIconizeEvent(*_args,**_kwargs) self.thisown = 1 @@ -750,10 +819,10 @@ class wxMaximizeEventPtr(wxEventPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMaximizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMaximizeEvent(wxMaximizeEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxMaximizeEvent,_args,_kwargs) + self.this = eventsc.new_wxMaximizeEvent(*_args,**_kwargs) self.thisown = 1 @@ -764,59 +833,59 @@ class wxJoystickEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetZPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_GetZPosition,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_GetZPosition(self, *_args, **_kwargs) return val def GetButtonState(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_GetButtonState,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_GetButtonState(self, *_args, **_kwargs) return val def GetButtonChange(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_GetButtonChange,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_GetButtonChange(self, *_args, **_kwargs) return val def GetJoystick(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_GetJoystick,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_GetJoystick(self, *_args, **_kwargs) return val def SetJoystick(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_SetJoystick,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_SetJoystick(self, *_args, **_kwargs) return val def SetButtonState(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_SetButtonState,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_SetButtonState(self, *_args, **_kwargs) return val def SetButtonChange(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_SetButtonChange,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_SetButtonChange(self, *_args, **_kwargs) return val def SetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_SetPosition,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_SetPosition(self, *_args, **_kwargs) return val def SetZPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_SetZPosition,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_SetZPosition(self, *_args, **_kwargs) return val def IsButton(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_IsButton,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_IsButton(self, *_args, **_kwargs) return val def IsMove(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_IsMove,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_IsMove(self, *_args, **_kwargs) return val def IsZMove(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_IsZMove,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_IsZMove(self, *_args, **_kwargs) return val def ButtonDown(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_ButtonDown,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_ButtonDown(self, *_args, **_kwargs) return val def ButtonUp(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_ButtonUp,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_ButtonUp(self, *_args, **_kwargs) return val def ButtonIsDown(self, *_args, **_kwargs): - val = apply(eventsc.wxJoystickEvent_ButtonIsDown,(self,) + _args, _kwargs) + val = eventsc.wxJoystickEvent_ButtonIsDown(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxJoystickEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxJoystickEvent(wxJoystickEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxJoystickEvent,_args,_kwargs) + self.this = eventsc.new_wxJoystickEvent(*_args,**_kwargs) self.thisown = 1 @@ -827,17 +896,17 @@ class wxDropFilesEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxDropFilesEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxDropFilesEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetNumberOfFiles(self, *_args, **_kwargs): - val = apply(eventsc.wxDropFilesEvent_GetNumberOfFiles,(self,) + _args, _kwargs) + val = eventsc.wxDropFilesEvent_GetNumberOfFiles(self, *_args, **_kwargs) return val def GetFiles(self, *_args, **_kwargs): - val = apply(eventsc.wxDropFilesEvent_GetFiles,(self,) + _args, _kwargs) + val = eventsc.wxDropFilesEvent_GetFiles(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDropFilesEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDropFilesEvent(wxDropFilesEventPtr): def __init__(self,this): self.this = this @@ -850,16 +919,16 @@ class wxIdleEventPtr(wxEventPtr): self.this = this self.thisown = 0 def RequestMore(self, *_args, **_kwargs): - val = apply(eventsc.wxIdleEvent_RequestMore,(self,) + _args, _kwargs) + val = eventsc.wxIdleEvent_RequestMore(self, *_args, **_kwargs) return val def MoreRequested(self, *_args, **_kwargs): - val = apply(eventsc.wxIdleEvent_MoreRequested,(self,) + _args, _kwargs) + val = eventsc.wxIdleEvent_MoreRequested(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxIdleEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxIdleEvent(wxIdleEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxIdleEvent,_args,_kwargs) + self.this = eventsc.new_wxIdleEvent(*_args,**_kwargs) self.thisown = 1 @@ -870,37 +939,37 @@ class wxUpdateUIEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetChecked(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_GetChecked,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_GetChecked(self, *_args, **_kwargs) return val def GetEnabled(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_GetEnabled,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_GetEnabled(self, *_args, **_kwargs) return val def GetText(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_GetText,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_GetText(self, *_args, **_kwargs) return val def GetSetText(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_GetSetText,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_GetSetText(self, *_args, **_kwargs) return val def GetSetChecked(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_GetSetChecked,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_GetSetChecked(self, *_args, **_kwargs) return val def GetSetEnabled(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_GetSetEnabled,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_GetSetEnabled(self, *_args, **_kwargs) return val def Check(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_Check,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_Check(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_Enable,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_Enable(self, *_args, **_kwargs) return val def SetText(self, *_args, **_kwargs): - val = apply(eventsc.wxUpdateUIEvent_SetText,(self,) + _args, _kwargs) + val = eventsc.wxUpdateUIEvent_SetText(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxUpdateUIEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxUpdateUIEvent(wxUpdateUIEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxUpdateUIEvent,_args,_kwargs) + self.this = eventsc.new_wxUpdateUIEvent(*_args,**_kwargs) self.thisown = 1 @@ -911,10 +980,10 @@ class wxSysColourChangedEventPtr(wxEventPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSysColourChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSysColourChangedEvent(wxSysColourChangedEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxSysColourChangedEvent,_args,_kwargs) + self.this = eventsc.new_wxSysColourChangedEvent(*_args,**_kwargs) self.thisown = 1 @@ -925,19 +994,19 @@ class wxNotifyEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def IsAllowed(self, *_args, **_kwargs): - val = apply(eventsc.wxNotifyEvent_IsAllowed,(self,) + _args, _kwargs) + val = eventsc.wxNotifyEvent_IsAllowed(self, *_args, **_kwargs) return val def Allow(self, *_args, **_kwargs): - val = apply(eventsc.wxNotifyEvent_Allow,(self,) + _args, _kwargs) + val = eventsc.wxNotifyEvent_Allow(self, *_args, **_kwargs) return val def Veto(self, *_args, **_kwargs): - val = apply(eventsc.wxNotifyEvent_Veto,(self,) + _args, _kwargs) + val = eventsc.wxNotifyEvent_Veto(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxNotifyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxNotifyEvent(wxNotifyEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxNotifyEvent,_args,_kwargs) + self.this = eventsc.new_wxNotifyEvent(*_args,**_kwargs) self.thisown = 1 @@ -948,10 +1017,10 @@ class wxDisplayChangedEventPtr(wxEventPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDisplayChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDisplayChangedEvent(wxDisplayChangedEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxDisplayChangedEvent,_args,_kwargs) + self.this = eventsc.new_wxDisplayChangedEvent(*_args,**_kwargs) self.thisown = 1 @@ -962,16 +1031,16 @@ class wxPaletteChangedEventPtr(wxEventPtr): self.this = this self.thisown = 0 def SetChangedWindow(self, *_args, **_kwargs): - val = apply(eventsc.wxPaletteChangedEvent_SetChangedWindow,(self,) + _args, _kwargs) + val = eventsc.wxPaletteChangedEvent_SetChangedWindow(self, *_args, **_kwargs) return val def GetChangedWindow(self, *_args, **_kwargs): - val = apply(eventsc.wxPaletteChangedEvent_GetChangedWindow,(self,) + _args, _kwargs) + val = eventsc.wxPaletteChangedEvent_GetChangedWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPaletteChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPaletteChangedEvent(wxPaletteChangedEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxPaletteChangedEvent,_args,_kwargs) + self.this = eventsc.new_wxPaletteChangedEvent(*_args,**_kwargs) self.thisown = 1 @@ -982,16 +1051,16 @@ class wxQueryNewPaletteEventPtr(wxEventPtr): self.this = this self.thisown = 0 def SetPaletteRealized(self, *_args, **_kwargs): - val = apply(eventsc.wxQueryNewPaletteEvent_SetPaletteRealized,(self,) + _args, _kwargs) + val = eventsc.wxQueryNewPaletteEvent_SetPaletteRealized(self, *_args, **_kwargs) return val def GetPaletteRealized(self, *_args, **_kwargs): - val = apply(eventsc.wxQueryNewPaletteEvent_GetPaletteRealized,(self,) + _args, _kwargs) + val = eventsc.wxQueryNewPaletteEvent_GetPaletteRealized(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxQueryNewPaletteEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxQueryNewPaletteEvent(wxQueryNewPaletteEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxQueryNewPaletteEvent,_args,_kwargs) + self.this = eventsc.new_wxQueryNewPaletteEvent(*_args,**_kwargs) self.thisown = 1 @@ -1002,13 +1071,13 @@ class wxWindowCreateEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetWindow(self, *_args, **_kwargs): - val = apply(eventsc.wxWindowCreateEvent_GetWindow,(self,) + _args, _kwargs) + val = eventsc.wxWindowCreateEvent_GetWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWindowCreateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWindowCreateEvent(wxWindowCreateEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxWindowCreateEvent,_args,_kwargs) + self.this = eventsc.new_wxWindowCreateEvent(*_args,**_kwargs) self.thisown = 1 @@ -1019,13 +1088,13 @@ class wxWindowDestroyEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetWindow(self, *_args, **_kwargs): - val = apply(eventsc.wxWindowDestroyEvent_GetWindow,(self,) + _args, _kwargs) + val = eventsc.wxWindowDestroyEvent_GetWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWindowDestroyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWindowDestroyEvent(wxWindowDestroyEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxWindowDestroyEvent,_args,_kwargs) + self.this = eventsc.new_wxWindowDestroyEvent(*_args,**_kwargs) self.thisown = 1 @@ -1036,17 +1105,17 @@ class wxContextMenuEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxContextMenuEvent_GetPosition,(self,) + _args, _kwargs) + val = eventsc.wxContextMenuEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) return val def SetPosition(self, *_args, **_kwargs): - val = apply(eventsc.wxContextMenuEvent_SetPosition,(self,) + _args, _kwargs) + val = eventsc.wxContextMenuEvent_SetPosition(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxContextMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxContextMenuEvent(wxContextMenuEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxContextMenuEvent,_args,_kwargs) + self.this = eventsc.new_wxContextMenuEvent(*_args,**_kwargs) self.thisown = 1 @@ -1057,13 +1126,13 @@ class wxTimerEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetInterval(self, *_args, **_kwargs): - val = apply(eventsc.wxTimerEvent_GetInterval,(self,) + _args, _kwargs) + val = eventsc.wxTimerEvent_GetInterval(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTimerEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTimerEvent(wxTimerEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxTimerEvent,_args,_kwargs) + self.this = eventsc.new_wxTimerEvent(*_args,**_kwargs) self.thisown = 1 @@ -1074,19 +1143,19 @@ class wxTextUrlEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetMouseEvent(self, *_args, **_kwargs): - val = apply(eventsc.wxTextUrlEvent_GetMouseEvent,(self,) + _args, _kwargs) + val = eventsc.wxTextUrlEvent_GetMouseEvent(self, *_args, **_kwargs) return val def GetURLStart(self, *_args, **_kwargs): - val = apply(eventsc.wxTextUrlEvent_GetURLStart,(self,) + _args, _kwargs) + val = eventsc.wxTextUrlEvent_GetURLStart(self, *_args, **_kwargs) return val def GetURLEnd(self, *_args, **_kwargs): - val = apply(eventsc.wxTextUrlEvent_GetURLEnd,(self,) + _args, _kwargs) + val = eventsc.wxTextUrlEvent_GetURLEnd(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTextUrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTextUrlEvent(wxTextUrlEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxTextUrlEvent,_args,_kwargs) + self.this = eventsc.new_wxTextUrlEvent(*_args,**_kwargs) self.thisown = 1 @@ -1103,16 +1172,16 @@ class wxPyEventPtr(wxEventPtr): except: pass def SetSelf(self, *_args, **_kwargs): - val = apply(eventsc.wxPyEvent_SetSelf,(self,) + _args, _kwargs) + val = eventsc.wxPyEvent_SetSelf(self, *_args, **_kwargs) return val def GetSelf(self, *_args, **_kwargs): - val = apply(eventsc.wxPyEvent_GetSelf,(self,) + _args, _kwargs) + val = eventsc.wxPyEvent_GetSelf(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyEvent(wxPyEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxPyEvent,_args,_kwargs) + self.this = eventsc.new_wxPyEvent(*_args,**_kwargs) self.thisown = 1 self.SetSelf(self) @@ -1130,16 +1199,16 @@ class wxPyCommandEventPtr(wxCommandEventPtr): except: pass def SetSelf(self, *_args, **_kwargs): - val = apply(eventsc.wxPyCommandEvent_SetSelf,(self,) + _args, _kwargs) + val = eventsc.wxPyCommandEvent_SetSelf(self, *_args, **_kwargs) return val def GetSelf(self, *_args, **_kwargs): - val = apply(eventsc.wxPyCommandEvent_GetSelf,(self,) + _args, _kwargs) + val = eventsc.wxPyCommandEvent_GetSelf(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyCommandEvent(wxPyCommandEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(eventsc.new_wxPyCommandEvent,_args,_kwargs) + self.this = eventsc.new_wxPyCommandEvent(*_args,**_kwargs) self.thisown = 1 self.SetSelf(self) @@ -1152,7 +1221,31 @@ class wxPyCommandEvent(wxPyCommandEventPtr): wxNewEventType = eventsc.wxNewEventType +wxIdleEvent_SetMode = eventsc.wxIdleEvent_SetMode + +wxIdleEvent_GetMode = eventsc.wxIdleEvent_GetMode + +wxIdleEvent_CanSend = eventsc.wxIdleEvent_CanSend + +wxUpdateUIEvent_SetUpdateInterval = eventsc.wxUpdateUIEvent_SetUpdateInterval + +wxUpdateUIEvent_GetUpdateInterval = eventsc.wxUpdateUIEvent_GetUpdateInterval + +wxUpdateUIEvent_CanUpdate = eventsc.wxUpdateUIEvent_CanUpdate + +wxUpdateUIEvent_ResetUpdateTime = eventsc.wxUpdateUIEvent_ResetUpdateTime + +wxUpdateUIEvent_SetMode = eventsc.wxUpdateUIEvent_SetMode + +wxUpdateUIEvent_GetMode = eventsc.wxUpdateUIEvent_GetMode + #-------------- VARIABLE WRAPPERS ------------------ +wxEVENT_PROPAGATE_NONE = eventsc.wxEVENT_PROPAGATE_NONE +wxEVENT_PROPAGATE_MAX = eventsc.wxEVENT_PROPAGATE_MAX +wxIDLE_PROCESS_ALL = eventsc.wxIDLE_PROCESS_ALL +wxIDLE_PROCESS_SPECIFIED = eventsc.wxIDLE_PROCESS_SPECIFIED +wxUPDATE_UI_PROCESS_ALL = eventsc.wxUPDATE_UI_PROCESS_ALL +wxUPDATE_UI_PROCESS_SPECIFIED = eventsc.wxUPDATE_UI_PROCESS_SPECIFIED diff --git a/wxPython/src/msw/filesys.cpp b/wxPython/src/msw/filesys.cpp index 1d34534b48..fd9cf1a587 100644 --- a/wxPython/src/msw/filesys.cpp +++ b/wxPython/src/msw/filesys.cpp @@ -128,6 +128,11 @@ IMP_PYCALLBACK_FSF_FSSTRING_pure(wxPyFileSystemHandler, wxFileSystemHandler, Ope IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, FindFirst); IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext); + wxString wxFileSystem_URLToFileName(const wxString& url) { + wxFileName fname = wxFileSystem::URLToFileName(url); + return fname.GetFullPath(); + } + void __wxMemoryFSHandler_AddFile_wxImage(const wxString& filename, wxImage& image, long type) { @@ -151,6 +156,44 @@ void __wxMemoryFSHandler_AddFile_Data(const wxString& filename, #ifdef __cplusplus extern "C" { #endif +static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "url", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_URLToFileName",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxString (wxFileSystem_URLToFileName(*_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + if (_obj0) + delete _arg0; +} +{ + delete _result; +} + return _resultobj; +} + static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxString * _arg0; @@ -1311,6 +1354,44 @@ static PyObject *_wrap_wxFileSystem_CleanUpHandlers(PyObject *self, PyObject *ar return _resultobj; } +static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "filename", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_FileNameToURL",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxString (wxFileSystem::FileNameToURL(*_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + if (_obj0) + delete _arg0; +} +{ + delete _result; +} + return _resultobj; +} + static void *SwigwxInternetFSHandlerTowxFileSystemHandler(void *ptr) { wxInternetFSHandler *src; wxFileSystemHandler *dest; @@ -1911,6 +1992,7 @@ static PyMethodDef filesyscMethods[] = { { "wxInternetFSHandler_OpenFile", (PyCFunction) _wrap_wxInternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS }, { "wxInternetFSHandler_CanOpen", (PyCFunction) _wrap_wxInternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS }, { "new_wxInternetFSHandler", (PyCFunction) _wrap_new_wxInternetFSHandler, METH_VARARGS | METH_KEYWORDS }, + { "wxFileSystem_FileNameToURL", (PyCFunction) _wrap_wxFileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS }, { "wxFileSystem_CleanUpHandlers", (PyCFunction) _wrap_wxFileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS }, { "wxFileSystem_AddHandler", (PyCFunction) _wrap_wxFileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS }, { "wxFileSystem_FindNext", (PyCFunction) _wrap_wxFileSystem_FindNext, METH_VARARGS | METH_KEYWORDS }, @@ -1939,6 +2021,7 @@ static PyMethodDef filesyscMethods[] = { { "__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS }, { "__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS }, { "__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS }, + { "wxFileSystem_URLToFileName", (PyCFunction) _wrap_wxFileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; #ifdef __cplusplus diff --git a/wxPython/src/msw/filesys.py b/wxPython/src/msw/filesys.py index 8950e6059b..27c1665beb 100644 --- a/wxPython/src/msw/filesys.py +++ b/wxPython/src/msw/filesys.py @@ -30,26 +30,26 @@ class wxFSFilePtr(wxObjectPtr): self.this = this self.thisown = 0 def GetStream(self, *_args, **_kwargs): - val = apply(filesysc.wxFSFile_GetStream,(self,) + _args, _kwargs) + val = filesysc.wxFSFile_GetStream(self, *_args, **_kwargs) return val def GetMimeType(self, *_args, **_kwargs): - val = apply(filesysc.wxFSFile_GetMimeType,(self,) + _args, _kwargs) + val = filesysc.wxFSFile_GetMimeType(self, *_args, **_kwargs) return val def GetLocation(self, *_args, **_kwargs): - val = apply(filesysc.wxFSFile_GetLocation,(self,) + _args, _kwargs) + val = filesysc.wxFSFile_GetLocation(self, *_args, **_kwargs) return val def GetAnchor(self, *_args, **_kwargs): - val = apply(filesysc.wxFSFile_GetAnchor,(self,) + _args, _kwargs) + val = filesysc.wxFSFile_GetAnchor(self, *_args, **_kwargs) return val def GetModificationTime(self, *_args, **_kwargs): - val = apply(filesysc.wxFSFile_GetModificationTime,(self,) + _args, _kwargs) + val = filesysc.wxFSFile_GetModificationTime(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFSFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFSFile(wxFSFilePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(filesysc.new_wxFSFile,_args,_kwargs) + self.this = filesysc.new_wxFSFile(*_args,**_kwargs) self.thisown = 1 @@ -60,7 +60,7 @@ class wxCPPFileSystemHandlerPtr(wxObjectPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCPPFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCPPFileSystemHandler(wxCPPFileSystemHandlerPtr): def __init__(self,this): self.this = this @@ -73,40 +73,40 @@ class wxFileSystemHandlerPtr(wxCPPFileSystemHandlerPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler__setCallbackInfo,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler__setCallbackInfo(self, *_args, **_kwargs) return val def CanOpen(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_CanOpen,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_CanOpen(self, *_args, **_kwargs) return val def OpenFile(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_OpenFile,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_OpenFile(self, *_args, **_kwargs) return val def FindFirst(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_FindFirst,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_FindFirst(self, *_args, **_kwargs) return val def FindNext(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_FindNext,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_FindNext(self, *_args, **_kwargs) return val def GetProtocol(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_GetProtocol,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_GetProtocol(self, *_args, **_kwargs) return val def GetLeftLocation(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_GetLeftLocation,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_GetLeftLocation(self, *_args, **_kwargs) return val def GetAnchor(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_GetAnchor,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_GetAnchor(self, *_args, **_kwargs) return val def GetRightLocation(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_GetRightLocation,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_GetRightLocation(self, *_args, **_kwargs) return val def GetMimeTypeFromExt(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystemHandler_GetMimeTypeFromExt,(self,) + _args, _kwargs) + val = filesysc.wxFileSystemHandler_GetMimeTypeFromExt(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileSystemHandler(wxFileSystemHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(filesysc.new_wxFileSystemHandler,_args,_kwargs) + self.this = filesysc.new_wxFileSystemHandler(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxFileSystemHandler) @@ -118,25 +118,25 @@ class wxFileSystemPtr(wxObjectPtr): self.this = this self.thisown = 0 def ChangePathTo(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystem_ChangePathTo,(self,) + _args, _kwargs) + val = filesysc.wxFileSystem_ChangePathTo(self, *_args, **_kwargs) return val def GetPath(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystem_GetPath,(self,) + _args, _kwargs) + val = filesysc.wxFileSystem_GetPath(self, *_args, **_kwargs) return val def OpenFile(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystem_OpenFile,(self,) + _args, _kwargs) + val = filesysc.wxFileSystem_OpenFile(self, *_args, **_kwargs) return val def FindFirst(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystem_FindFirst,(self,) + _args, _kwargs) + val = filesysc.wxFileSystem_FindFirst(self, *_args, **_kwargs) return val def FindNext(self, *_args, **_kwargs): - val = apply(filesysc.wxFileSystem_FindNext,(self,) + _args, _kwargs) + val = filesysc.wxFileSystem_FindNext(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileSystem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileSystem(wxFileSystemPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(filesysc.new_wxFileSystem,_args,_kwargs) + self.this = filesysc.new_wxFileSystem(*_args,**_kwargs) self.thisown = 1 @@ -147,16 +147,16 @@ class wxInternetFSHandlerPtr(wxCPPFileSystemHandlerPtr): self.this = this self.thisown = 0 def CanOpen(self, *_args, **_kwargs): - val = apply(filesysc.wxInternetFSHandler_CanOpen,(self,) + _args, _kwargs) + val = filesysc.wxInternetFSHandler_CanOpen(self, *_args, **_kwargs) return val def OpenFile(self, *_args, **_kwargs): - val = apply(filesysc.wxInternetFSHandler_OpenFile,(self,) + _args, _kwargs) + val = filesysc.wxInternetFSHandler_OpenFile(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxInternetFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxInternetFSHandler(wxInternetFSHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(filesysc.new_wxInternetFSHandler,_args,_kwargs) + self.this = filesysc.new_wxInternetFSHandler(*_args,**_kwargs) self.thisown = 1 @@ -167,22 +167,22 @@ class wxZipFSHandlerPtr(wxCPPFileSystemHandlerPtr): self.this = this self.thisown = 0 def CanOpen(self, *_args, **_kwargs): - val = apply(filesysc.wxZipFSHandler_CanOpen,(self,) + _args, _kwargs) + val = filesysc.wxZipFSHandler_CanOpen(self, *_args, **_kwargs) return val def OpenFile(self, *_args, **_kwargs): - val = apply(filesysc.wxZipFSHandler_OpenFile,(self,) + _args, _kwargs) + val = filesysc.wxZipFSHandler_OpenFile(self, *_args, **_kwargs) return val def FindFirst(self, *_args, **_kwargs): - val = apply(filesysc.wxZipFSHandler_FindFirst,(self,) + _args, _kwargs) + val = filesysc.wxZipFSHandler_FindFirst(self, *_args, **_kwargs) return val def FindNext(self, *_args, **_kwargs): - val = apply(filesysc.wxZipFSHandler_FindNext,(self,) + _args, _kwargs) + val = filesysc.wxZipFSHandler_FindNext(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxZipFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxZipFSHandler(wxZipFSHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(filesysc.new_wxZipFSHandler,_args,_kwargs) + self.this = filesysc.new_wxZipFSHandler(*_args,**_kwargs) self.thisown = 1 @@ -193,22 +193,22 @@ class wxMemoryFSHandlerPtr(wxCPPFileSystemHandlerPtr): self.this = this self.thisown = 0 def CanOpen(self, *_args, **_kwargs): - val = apply(filesysc.wxMemoryFSHandler_CanOpen,(self,) + _args, _kwargs) + val = filesysc.wxMemoryFSHandler_CanOpen(self, *_args, **_kwargs) return val def OpenFile(self, *_args, **_kwargs): - val = apply(filesysc.wxMemoryFSHandler_OpenFile,(self,) + _args, _kwargs) + val = filesysc.wxMemoryFSHandler_OpenFile(self, *_args, **_kwargs) return val def FindFirst(self, *_args, **_kwargs): - val = apply(filesysc.wxMemoryFSHandler_FindFirst,(self,) + _args, _kwargs) + val = filesysc.wxMemoryFSHandler_FindFirst(self, *_args, **_kwargs) return val def FindNext(self, *_args, **_kwargs): - val = apply(filesysc.wxMemoryFSHandler_FindNext,(self,) + _args, _kwargs) + val = filesysc.wxMemoryFSHandler_FindNext(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMemoryFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMemoryFSHandler(wxMemoryFSHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(filesysc.new_wxMemoryFSHandler,_args,_kwargs) + self.this = filesysc.new_wxMemoryFSHandler(*_args,**_kwargs) self.thisown = 1 @@ -218,6 +218,8 @@ class wxMemoryFSHandler(wxMemoryFSHandlerPtr): #-------------- FUNCTION WRAPPERS ------------------ +wxFileSystem_URLToFileName = filesysc.wxFileSystem_URLToFileName + __wxMemoryFSHandler_AddFile_wxImage = filesysc.__wxMemoryFSHandler_AddFile_wxImage __wxMemoryFSHandler_AddFile_wxBitmap = filesysc.__wxMemoryFSHandler_AddFile_wxBitmap @@ -228,6 +230,8 @@ wxFileSystem_AddHandler = filesysc.wxFileSystem_AddHandler wxFileSystem_CleanUpHandlers = filesysc.wxFileSystem_CleanUpHandlers +wxFileSystem_FileNameToURL = filesysc.wxFileSystem_FileNameToURL + wxMemoryFSHandler_RemoveFile = filesysc.wxMemoryFSHandler_RemoveFile diff --git a/wxPython/src/msw/fonts.cpp b/wxPython/src/msw/fonts.cpp index c0606d9762..2d18304dc6 100644 --- a/wxPython/src/msw/fonts.cpp +++ b/wxPython/src/msw/fonts.cpp @@ -976,140 +976,82 @@ static PyObject *_wrap_wxFontMapper_Set(PyObject *self, PyObject *args, PyObject return _resultobj; } -static PyObject * wxFontMapper_GetAltForEncoding(wxFontMapper *self,wxFontEncoding encoding,const wxString & facename,bool interactive) { - wxFontEncoding alt_enc; - if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive)) - return PyInt_FromLong(alt_enc); - else { - Py_INCREF(Py_None); - return Py_None; - } - } -static PyObject *_wrap_wxFontMapper_GetAltForEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFontMapper_CharsetToEncoding(_swigobj,_swigarg0,_swigarg1) (_swigobj->CharsetToEncoding(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxFontMapper_CharsetToEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - PyObject * _result; + wxFontEncoding _result; wxFontMapper * _arg0; - wxFontEncoding _arg1; - wxString * _arg2 = (wxString *) &wxPyEmptyString; - bool _arg3 = (bool ) TRUE; + wxString * _arg1; + bool _arg2 = (bool ) true; PyObject * _argo0 = 0; - PyObject * _obj2 = 0; - int tempbool3 = (int) TRUE; - char *_kwnames[] = { "self","encoding","facename","interactive", NULL }; + PyObject * _obj1 = 0; + int tempbool2 = (int) true; + char *_kwnames[] = { "self","charset","interactive", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|Oi:wxFontMapper_GetAltForEncoding",_kwnames,&_argo0,&_arg1,&_obj2,&tempbool3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxFontMapper_CharsetToEncoding",_kwnames,&_argo0,&_obj1,&tempbool2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_GetAltForEncoding. Expected _wxFontMapper_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_CharsetToEncoding. Expected _wxFontMapper_p."); return NULL; } } - if (_obj2) { - _arg2 = wxString_in_helper(_obj2); - if (_arg2 == NULL) + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) return NULL; } - _arg3 = (bool ) tempbool3; + _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (PyObject *)wxFontMapper_GetAltForEncoding(_arg0,_arg1,*_arg2,_arg3); + _result = (wxFontEncoding )wxFontMapper_CharsetToEncoding(_arg0,*_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ - _resultobj = _result; -} +} _resultobj = Py_BuildValue("i",_result); { - if (_obj2) - delete _arg2; + if (_obj1) + delete _arg1; } return _resultobj; } -#define wxFontMapper_IsEncodingAvailable(_swigobj,_swigarg0,_swigarg1) (_swigobj->IsEncodingAvailable(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxFontMapper_IsEncodingAvailable(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxFontMapper_GetSupportedEncodingsCount(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxFontMapper * _arg0; - wxFontEncoding _arg1; - wxString * _arg2 = (wxString *) &wxPyEmptyString; - PyObject * _argo0 = 0; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","encoding","facename", NULL }; + size_t _result; + char *_kwnames[] = { NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|O:wxFontMapper_IsEncodingAvailable",_kwnames,&_argo0,&_arg1,&_obj2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_IsEncodingAvailable. Expected _wxFontMapper_p."); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxFontMapper_GetSupportedEncodingsCount",_kwnames)) return NULL; - } - } - if (_obj2) -{ - _arg2 = wxString_in_helper(_obj2); - if (_arg2 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxFontMapper_IsEncodingAvailable(_arg0,_arg1,*_arg2); + _result = (size_t )wxFontMapper::GetSupportedEncodingsCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); -{ - if (_obj2) - delete _arg2; -} return _resultobj; } -#define wxFontMapper_CharsetToEncoding(_swigobj,_swigarg0,_swigarg1) (_swigobj->CharsetToEncoding(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxFontMapper_CharsetToEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxFontMapper_GetEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFontEncoding _result; - wxFontMapper * _arg0; - wxString * _arg1; - bool _arg2 = (bool ) TRUE; - PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - int tempbool2 = (int) TRUE; - char *_kwnames[] = { "self","charset","interactive", NULL }; + size_t _arg0; + char *_kwnames[] = { "n", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxFontMapper_CharsetToEncoding",_kwnames,&_argo0,&_obj1,&tempbool2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_CharsetToEncoding. Expected _wxFontMapper_p."); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxFontMapper_GetEncoding",_kwnames,&_arg0)) return NULL; - } - } -{ - _arg1 = wxString_in_helper(_obj1); - if (_arg1 == NULL) - return NULL; -} - _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxFontEncoding )wxFontMapper_CharsetToEncoding(_arg0,*_arg1,_arg2); + _result = (wxFontEncoding )wxFontMapper::GetEncoding(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); -{ - if (_obj1) - delete _arg1; -} return _resultobj; } @@ -1169,35 +1111,35 @@ static PyObject *_wrap_wxFontMapper_GetEncodingDescription(PyObject *self, PyObj return _resultobj; } -#define wxFontMapper_SetDialogParent(_swigobj,_swigarg0) (_swigobj->SetDialogParent(_swigarg0)) -static PyObject *_wrap_wxFontMapper_SetDialogParent(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFontMapper_SetConfig(_swigobj,_swigarg0) (_swigobj->SetConfig(_swigarg0)) +static PyObject *_wrap_wxFontMapper_SetConfig(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFontMapper * _arg0; - wxWindow * _arg1; + wxConfigBase * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "self","parent", NULL }; + char *_kwnames[] = { "self","config", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetDialogParent",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetConfig",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetDialogParent. Expected _wxFontMapper_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetConfig. Expected _wxFontMapper_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontMapper_SetDialogParent. Expected _wxWindow_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxConfigBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontMapper_SetConfig. Expected _wxConfigBase_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFontMapper_SetDialogParent(_arg0,_arg1); + wxFontMapper_SetConfig(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1206,22 +1148,22 @@ static PyObject *_wrap_wxFontMapper_SetDialogParent(PyObject *self, PyObject *ar return _resultobj; } -#define wxFontMapper_SetDialogTitle(_swigobj,_swigarg0) (_swigobj->SetDialogTitle(_swigarg0)) -static PyObject *_wrap_wxFontMapper_SetDialogTitle(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFontMapper_SetConfigPath(_swigobj,_swigarg0) (_swigobj->SetConfigPath(_swigarg0)) +static PyObject *_wrap_wxFontMapper_SetConfigPath(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFontMapper * _arg0; wxString * _arg1; PyObject * _argo0 = 0; PyObject * _obj1 = 0; - char *_kwnames[] = { "self","title", NULL }; + char *_kwnames[] = { "self","prefix", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetDialogTitle",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetConfigPath",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetDialogTitle. Expected _wxFontMapper_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetConfigPath. Expected _wxFontMapper_p."); return NULL; } } @@ -1232,7 +1174,7 @@ static PyObject *_wrap_wxFontMapper_SetDialogTitle(PyObject *self, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFontMapper_SetDialogTitle(_arg0,*_arg1); + wxFontMapper_SetConfigPath(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1245,105 +1187,191 @@ static PyObject *_wrap_wxFontMapper_SetDialogTitle(PyObject *self, PyObject *arg return _resultobj; } -#define wxFontMapper_SetConfig(_swigobj,_swigarg0) (_swigobj->SetConfig(_swigarg0)) -static PyObject *_wrap_wxFontMapper_SetConfig(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxFontMapper_GetDefaultConfigPath(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxChar * _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxFontMapper_GetDefaultConfigPath",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxChar *)wxFontMapper::GetDefaultConfigPath(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("s", _result); + return _resultobj; +} + +static PyObject * wxFontMapper_GetAltForEncoding(wxFontMapper *self,wxFontEncoding encoding,const wxString & facename,bool interactive) { + wxFontEncoding alt_enc; + if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive)) + return PyInt_FromLong(alt_enc); + else { + Py_INCREF(Py_None); + return Py_None; + } + } +static PyObject *_wrap_wxFontMapper_GetAltForEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; wxFontMapper * _arg0; - wxConfigBase * _arg1; + wxFontEncoding _arg1; + wxString * _arg2 = (wxString *) &wxPyEmptyString; + bool _arg3 = (bool ) TRUE; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","config", NULL }; + PyObject * _obj2 = 0; + int tempbool3 = (int) TRUE; + char *_kwnames[] = { "self","encoding","facename","interactive", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetConfig",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|Oi:wxFontMapper_GetAltForEncoding",_kwnames,&_argo0,&_arg1,&_obj2,&tempbool3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetConfig. Expected _wxFontMapper_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_GetAltForEncoding. Expected _wxFontMapper_p."); return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxConfigBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontMapper_SetConfig. Expected _wxConfigBase_p."); + if (_obj2) +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) return NULL; - } - } +} + _arg3 = (bool ) tempbool3; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFontMapper_SetConfig(_arg0,_arg1); + _result = (PyObject *)wxFontMapper_GetAltForEncoding(_arg0,_arg1,*_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ + _resultobj = _result; +} +{ + if (_obj2) + delete _arg2; +} return _resultobj; } -#define wxFontMapper_SetConfigPath(_swigobj,_swigarg0) (_swigobj->SetConfigPath(_swigarg0)) -static PyObject *_wrap_wxFontMapper_SetConfigPath(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFontMapper_IsEncodingAvailable(_swigobj,_swigarg0,_swigarg1) (_swigobj->IsEncodingAvailable(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxFontMapper_IsEncodingAvailable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + bool _result; wxFontMapper * _arg0; - wxString * _arg1; + wxFontEncoding _arg1; + wxString * _arg2 = (wxString *) &wxPyEmptyString; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","prefix", NULL }; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","encoding","facename", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetConfigPath",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|O:wxFontMapper_IsEncodingAvailable",_kwnames,&_argo0,&_arg1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetConfigPath. Expected _wxFontMapper_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_IsEncodingAvailable. Expected _wxFontMapper_p."); return NULL; } } + if (_obj2) { - _arg1 = wxString_in_helper(_obj1); - if (_arg1 == NULL) + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) return NULL; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFontMapper_SetConfigPath(_arg0,*_arg1); + _result = (bool )wxFontMapper_IsEncodingAvailable(_arg0,_arg1,*_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); { - if (_obj1) - delete _arg1; + if (_obj2) + delete _arg2; } return _resultobj; } -static PyObject *_wrap_wxFontMapper_GetDefaultConfigPath(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxFontMapper_SetDialogParent(_swigobj,_swigarg0) (_swigobj->SetDialogParent(_swigarg0)) +static PyObject *_wrap_wxFontMapper_SetDialogParent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - char *_kwnames[] = { NULL }; + wxFontMapper * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","parent", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxFontMapper_GetDefaultConfigPath",_kwnames)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetDialogParent",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetDialogParent. Expected _wxFontMapper_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFontMapper_SetDialogParent. Expected _wxWindow_p."); return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxFontMapper::GetDefaultConfigPath()); + wxFontMapper_SetDialogParent(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; } + +#define wxFontMapper_SetDialogTitle(_swigobj,_swigarg0) (_swigobj->SetDialogTitle(_swigarg0)) +static PyObject *_wrap_wxFontMapper_SetDialogTitle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFontMapper * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","title", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontMapper_SetDialogTitle",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFontMapper_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontMapper_SetDialogTitle. Expected _wxFontMapper_p."); + return NULL; + } + } { - delete _result; + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxFontMapper_SetDialogTitle(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; } return _resultobj; } @@ -3510,6 +3538,34 @@ static PyObject *_wrap_wxLocale_GetLanguageInfo(PyObject *self, PyObject *args, return _resultobj; } +static PyObject *_wrap_wxLocale_GetLanguageName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + int _arg0; + char *_kwnames[] = { "lang", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxLocale_GetLanguageName",_kwnames,&_arg0)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxString (wxLocale::GetLanguageName(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + delete _result; +} + return _resultobj; +} + static PyObject *_wrap_wxLocale_FindLanguageInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxLanguageInfo * _result; @@ -3872,6 +3928,7 @@ static PyMethodDef fontscMethods[] = { { "wxLocale_GetString", (PyCFunction) _wrap_wxLocale_GetString, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_AddLanguage", (PyCFunction) _wrap_wxLocale_AddLanguage, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_FindLanguageInfo", (PyCFunction) _wrap_wxLocale_FindLanguageInfo, METH_VARARGS | METH_KEYWORDS }, + { "wxLocale_GetLanguageName", (PyCFunction) _wrap_wxLocale_GetLanguageName, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_GetLanguageInfo", (PyCFunction) _wrap_wxLocale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_IsLoaded", (PyCFunction) _wrap_wxLocale_IsLoaded, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_AddCatalog", (PyCFunction) _wrap_wxLocale_AddCatalog, METH_VARARGS | METH_KEYWORDS }, @@ -3937,16 +3994,18 @@ static PyMethodDef fontscMethods[] = { { "wxFont_wxFontFromNativeInfoString", (PyCFunction) _wrap_wxFont_wxFontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS }, { "new_wxFontFromNativeInfo", (PyCFunction) _wrap_new_wxFontFromNativeInfo, METH_VARARGS | METH_KEYWORDS }, { "new_wxFont", (PyCFunction) _wrap_new_wxFont, METH_VARARGS | METH_KEYWORDS }, + { "wxFontMapper_SetDialogTitle", (PyCFunction) _wrap_wxFontMapper_SetDialogTitle, METH_VARARGS | METH_KEYWORDS }, + { "wxFontMapper_SetDialogParent", (PyCFunction) _wrap_wxFontMapper_SetDialogParent, METH_VARARGS | METH_KEYWORDS }, + { "wxFontMapper_IsEncodingAvailable", (PyCFunction) _wrap_wxFontMapper_IsEncodingAvailable, METH_VARARGS | METH_KEYWORDS }, + { "wxFontMapper_GetAltForEncoding", (PyCFunction) _wrap_wxFontMapper_GetAltForEncoding, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_GetDefaultConfigPath", (PyCFunction) _wrap_wxFontMapper_GetDefaultConfigPath, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_SetConfigPath", (PyCFunction) _wrap_wxFontMapper_SetConfigPath, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_SetConfig", (PyCFunction) _wrap_wxFontMapper_SetConfig, METH_VARARGS | METH_KEYWORDS }, - { "wxFontMapper_SetDialogTitle", (PyCFunction) _wrap_wxFontMapper_SetDialogTitle, METH_VARARGS | METH_KEYWORDS }, - { "wxFontMapper_SetDialogParent", (PyCFunction) _wrap_wxFontMapper_SetDialogParent, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_GetEncodingDescription", (PyCFunction) _wrap_wxFontMapper_GetEncodingDescription, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_GetEncodingName", (PyCFunction) _wrap_wxFontMapper_GetEncodingName, METH_VARARGS | METH_KEYWORDS }, + { "wxFontMapper_GetEncoding", (PyCFunction) _wrap_wxFontMapper_GetEncoding, METH_VARARGS | METH_KEYWORDS }, + { "wxFontMapper_GetSupportedEncodingsCount", (PyCFunction) _wrap_wxFontMapper_GetSupportedEncodingsCount, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_CharsetToEncoding", (PyCFunction) _wrap_wxFontMapper_CharsetToEncoding, METH_VARARGS | METH_KEYWORDS }, - { "wxFontMapper_IsEncodingAvailable", (PyCFunction) _wrap_wxFontMapper_IsEncodingAvailable, METH_VARARGS | METH_KEYWORDS }, - { "wxFontMapper_GetAltForEncoding", (PyCFunction) _wrap_wxFontMapper_GetAltForEncoding, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_Set", (PyCFunction) _wrap_wxFontMapper_Set, METH_VARARGS | METH_KEYWORDS }, { "wxFontMapper_Get", (PyCFunction) _wrap_wxFontMapper_Get, METH_VARARGS | METH_KEYWORDS }, { "delete_wxFontMapper", (PyCFunction) _wrap_delete_wxFontMapper, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/fonts.py b/wxPython/src/msw/fonts.py index 2b3782ef93..e36477f30c 100644 --- a/wxPython/src/msw/fonts.py +++ b/wxPython/src/msw/fonts.py @@ -7,70 +7,70 @@ class wxNativeFontInfoPtr : self.this = this self.thisown = 0 def Init(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_Init,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_Init(self, *_args, **_kwargs) return val def GetPointSize(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_GetPointSize,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_GetPointSize(self, *_args, **_kwargs) return val def GetStyle(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_GetStyle,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_GetStyle(self, *_args, **_kwargs) return val def GetWeight(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_GetWeight,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_GetWeight(self, *_args, **_kwargs) return val def GetUnderlined(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_GetUnderlined,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_GetUnderlined(self, *_args, **_kwargs) return val def GetFaceName(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_GetFaceName,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_GetFaceName(self, *_args, **_kwargs) return val def GetFamily(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_GetFamily,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_GetFamily(self, *_args, **_kwargs) return val def GetEncoding(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_GetEncoding,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_GetEncoding(self, *_args, **_kwargs) return val def SetPointSize(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_SetPointSize,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_SetPointSize(self, *_args, **_kwargs) return val def SetStyle(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_SetStyle,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_SetStyle(self, *_args, **_kwargs) return val def SetWeight(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_SetWeight,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_SetWeight(self, *_args, **_kwargs) return val def SetUnderlined(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_SetUnderlined,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_SetUnderlined(self, *_args, **_kwargs) return val def SetFaceName(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_SetFaceName,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_SetFaceName(self, *_args, **_kwargs) return val def SetFamily(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_SetFamily,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_SetFamily(self, *_args, **_kwargs) return val def SetEncoding(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_SetEncoding,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_SetEncoding(self, *_args, **_kwargs) return val def FromString(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_FromString,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_FromString(self, *_args, **_kwargs) return val def ToString(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_ToString,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_ToString(self, *_args, **_kwargs) return val def __str__(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo___str__,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo___str__(self, *_args, **_kwargs) return val def FromUserString(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_FromUserString,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_FromUserString(self, *_args, **_kwargs) return val def ToUserString(self, *_args, **_kwargs): - val = apply(fontsc.wxNativeFontInfo_ToUserString,(self,) + _args, _kwargs) + val = fontsc.wxNativeFontInfo_ToUserString(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxNativeFontInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxNativeFontInfo(wxNativeFontInfoPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(fontsc.new_wxNativeFontInfo,_args,_kwargs) + self.this = fontsc.new_wxNativeFontInfo(*_args,**_kwargs) self.thisown = 1 @@ -86,32 +86,32 @@ class wxFontMapperPtr : delfunc(self) except: pass + def CharsetToEncoding(self, *_args, **_kwargs): + val = fontsc.wxFontMapper_CharsetToEncoding(self, *_args, **_kwargs) + return val + def SetConfig(self, *_args, **_kwargs): + val = fontsc.wxFontMapper_SetConfig(self, *_args, **_kwargs) + return val + def SetConfigPath(self, *_args, **_kwargs): + val = fontsc.wxFontMapper_SetConfigPath(self, *_args, **_kwargs) + return val def GetAltForEncoding(self, *_args, **_kwargs): - val = apply(fontsc.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs) + val = fontsc.wxFontMapper_GetAltForEncoding(self, *_args, **_kwargs) return val def IsEncodingAvailable(self, *_args, **_kwargs): - val = apply(fontsc.wxFontMapper_IsEncodingAvailable,(self,) + _args, _kwargs) - return val - def CharsetToEncoding(self, *_args, **_kwargs): - val = apply(fontsc.wxFontMapper_CharsetToEncoding,(self,) + _args, _kwargs) + val = fontsc.wxFontMapper_IsEncodingAvailable(self, *_args, **_kwargs) return val def SetDialogParent(self, *_args, **_kwargs): - val = apply(fontsc.wxFontMapper_SetDialogParent,(self,) + _args, _kwargs) + val = fontsc.wxFontMapper_SetDialogParent(self, *_args, **_kwargs) return val def SetDialogTitle(self, *_args, **_kwargs): - val = apply(fontsc.wxFontMapper_SetDialogTitle,(self,) + _args, _kwargs) - return val - def SetConfig(self, *_args, **_kwargs): - val = apply(fontsc.wxFontMapper_SetConfig,(self,) + _args, _kwargs) - return val - def SetConfigPath(self, *_args, **_kwargs): - val = apply(fontsc.wxFontMapper_SetConfigPath,(self,) + _args, _kwargs) + val = fontsc.wxFontMapper_SetDialogTitle(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFontMapper instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFontMapper(wxFontMapperPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(fontsc.new_wxFontMapper,_args,_kwargs) + self.this = fontsc.new_wxFontMapper(*_args,**_kwargs) self.thisown = 1 @@ -122,7 +122,7 @@ class wxFontPtr(wxObjectPtr): self.this = this self.thisown = 0 def wxFontFromNativeInfoString(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_wxFontFromNativeInfoString,(self,) + _args, _kwargs) + val = fontsc.wxFont_wxFontFromNativeInfoString(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def __del__(self, delfunc=fontsc.delete_wxFont): @@ -132,95 +132,96 @@ class wxFontPtr(wxObjectPtr): except: pass def Ok(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_Ok,(self,) + _args, _kwargs) + val = fontsc.wxFont_Ok(self, *_args, **_kwargs) return val def GetPointSize(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetPointSize,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetPointSize(self, *_args, **_kwargs) return val def GetFamily(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetFamily,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetFamily(self, *_args, **_kwargs) return val def GetStyle(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetStyle,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetStyle(self, *_args, **_kwargs) return val def GetWeight(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetWeight,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetWeight(self, *_args, **_kwargs) return val def GetUnderlined(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetUnderlined,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetUnderlined(self, *_args, **_kwargs) return val def GetFaceName(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetFaceName,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetFaceName(self, *_args, **_kwargs) return val def GetEncoding(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetEncoding,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetEncoding(self, *_args, **_kwargs) return val def IsFixedWidth(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_IsFixedWidth,(self,) + _args, _kwargs) + val = fontsc.wxFont_IsFixedWidth(self, *_args, **_kwargs) return val def GetNativeFontInfo(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetNativeFontInfo(self, *_args, **_kwargs) if val: val = wxNativeFontInfoPtr(val) return val def GetNativeFontInfoDesc(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetNativeFontInfoDesc,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetNativeFontInfoDesc(self, *_args, **_kwargs) return val def GetNativeFontInfoUserDesc(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetNativeFontInfoUserDesc,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetNativeFontInfoUserDesc(self, *_args, **_kwargs) return val def SetPointSize(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetPointSize,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetPointSize(self, *_args, **_kwargs) return val def SetFamily(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetFamily,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetFamily(self, *_args, **_kwargs) return val def SetStyle(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetStyle,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetStyle(self, *_args, **_kwargs) return val def SetWeight(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetWeight,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetWeight(self, *_args, **_kwargs) return val def SetFaceName(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetFaceName,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetFaceName(self, *_args, **_kwargs) return val def SetUnderlined(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetUnderlined,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetUnderlined(self, *_args, **_kwargs) return val def SetEncoding(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetEncoding,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetEncoding(self, *_args, **_kwargs) return val def SetNativeFontInfo(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetNativeFontInfo,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetNativeFontInfo(self, *_args, **_kwargs) return val def SetNativeFontInfoUserDesc(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetNativeFontInfoUserDesc,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetNativeFontInfoUserDesc(self, *_args, **_kwargs) return val def GetFamilyString(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetFamilyString,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetFamilyString(self, *_args, **_kwargs) return val def GetStyleString(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetStyleString,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetStyleString(self, *_args, **_kwargs) return val def GetWeightString(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetWeightString,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetWeightString(self, *_args, **_kwargs) return val def SetNoAntiAliasing(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_SetNoAntiAliasing,(self,) + _args, _kwargs) + val = fontsc.wxFont_SetNoAntiAliasing(self, *_args, **_kwargs) return val def GetNoAntiAliasing(self, *_args, **_kwargs): - val = apply(fontsc.wxFont_GetNoAntiAliasing,(self,) + _args, _kwargs) + val = fontsc.wxFont_GetNoAntiAliasing(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFont instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxFont(wxFontPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(fontsc.new_wxFont,_args,_kwargs) + self.this = fontsc.new_wxFont(*_args,**_kwargs) self.thisown = 1 def wxFontFromNativeInfo(*_args,**_kwargs): - val = wxFontPtr(apply(fontsc.new_wxFontFromNativeInfo,_args,_kwargs)) + val = wxFontPtr(fontsc.new_wxFontFromNativeInfo(*_args,**_kwargs)) val.thisown = 1 return val @@ -230,20 +231,20 @@ class wxFontListPtr(wxObjectPtr): self.this = this self.thisown = 0 def AddFont(self, *_args, **_kwargs): - val = apply(fontsc.wxFontList_AddFont,(self,) + _args, _kwargs) + val = fontsc.wxFontList_AddFont(self, *_args, **_kwargs) return val def FindOrCreateFont(self, *_args, **_kwargs): - val = apply(fontsc.wxFontList_FindOrCreateFont,(self,) + _args, _kwargs) + val = fontsc.wxFontList_FindOrCreateFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) return val def RemoveFont(self, *_args, **_kwargs): - val = apply(fontsc.wxFontList_RemoveFont,(self,) + _args, _kwargs) + val = fontsc.wxFontList_RemoveFont(self, *_args, **_kwargs) return val def GetCount(self, *_args, **_kwargs): - val = apply(fontsc.wxFontList_GetCount,(self,) + _args, _kwargs) + val = fontsc.wxFontList_GetCount(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFontList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFontList(wxFontListPtr): def __init__(self,this): self.this = this @@ -262,25 +263,25 @@ class wxFontEnumeratorPtr : except: pass def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(fontsc.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs) + val = fontsc.wxFontEnumerator__setCallbackInfo(self, *_args, **_kwargs) return val def EnumerateFacenames(self, *_args, **_kwargs): - val = apply(fontsc.wxFontEnumerator_EnumerateFacenames,(self,) + _args, _kwargs) + val = fontsc.wxFontEnumerator_EnumerateFacenames(self, *_args, **_kwargs) return val def EnumerateEncodings(self, *_args, **_kwargs): - val = apply(fontsc.wxFontEnumerator_EnumerateEncodings,(self,) + _args, _kwargs) + val = fontsc.wxFontEnumerator_EnumerateEncodings(self, *_args, **_kwargs) return val def GetEncodings(self, *_args, **_kwargs): - val = apply(fontsc.wxFontEnumerator_GetEncodings,(self,) + _args, _kwargs) + val = fontsc.wxFontEnumerator_GetEncodings(self, *_args, **_kwargs) return val def GetFacenames(self, *_args, **_kwargs): - val = apply(fontsc.wxFontEnumerator_GetFacenames,(self,) + _args, _kwargs) + val = fontsc.wxFontEnumerator_GetFacenames(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFontEnumerator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFontEnumerator(wxFontEnumeratorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(fontsc.new_wxFontEnumerator,_args,_kwargs) + self.this = fontsc.new_wxFontEnumerator(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxFontEnumerator, 0) @@ -311,7 +312,7 @@ class wxLanguageInfoPtr : return fontsc.wxLanguageInfo_Description_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLanguageInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLanguageInfo(wxLanguageInfoPtr): def __init__(self,this): self.this = this @@ -330,51 +331,51 @@ class wxLocalePtr : except: pass def Init1(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_Init1,(self,) + _args, _kwargs) + val = fontsc.wxLocale_Init1(self, *_args, **_kwargs) return val def Init2(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_Init2,(self,) + _args, _kwargs) + val = fontsc.wxLocale_Init2(self, *_args, **_kwargs) return val def IsOk(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_IsOk,(self,) + _args, _kwargs) + val = fontsc.wxLocale_IsOk(self, *_args, **_kwargs) return val def GetLocale(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_GetLocale,(self,) + _args, _kwargs) + val = fontsc.wxLocale_GetLocale(self, *_args, **_kwargs) return val def GetLanguage(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_GetLanguage,(self,) + _args, _kwargs) + val = fontsc.wxLocale_GetLanguage(self, *_args, **_kwargs) return val def GetSysName(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_GetSysName,(self,) + _args, _kwargs) + val = fontsc.wxLocale_GetSysName(self, *_args, **_kwargs) return val def GetCanonicalName(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_GetCanonicalName,(self,) + _args, _kwargs) + val = fontsc.wxLocale_GetCanonicalName(self, *_args, **_kwargs) return val def AddCatalog(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_AddCatalog,(self,) + _args, _kwargs) + val = fontsc.wxLocale_AddCatalog(self, *_args, **_kwargs) return val def IsLoaded(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_IsLoaded,(self,) + _args, _kwargs) + val = fontsc.wxLocale_IsLoaded(self, *_args, **_kwargs) return val def GetString(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_GetString,(self,) + _args, _kwargs) + val = fontsc.wxLocale_GetString(self, *_args, **_kwargs) return val def GetName(self, *_args, **_kwargs): - val = apply(fontsc.wxLocale_GetName,(self,) + _args, _kwargs) + val = fontsc.wxLocale_GetName(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLocale instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def Init(self, *_args, **_kwargs): if type(_args[0]) in [type(''), type(u'')]: - val = apply(self.Init1, _args, _kwargs) + val = self.Init1(*_args, **_kwargs) else: - val = apply(self.Init2, _args, _kwargs) + val = self.Init2(*_args, **_kwargs) return val class wxLocale(wxLocalePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(fontsc.new_wxLocale,_args,_kwargs) + self.this = fontsc.new_wxLocale(*_args,**_kwargs) self.thisown = 1 @@ -391,16 +392,17 @@ class wxEncodingConverterPtr(wxObjectPtr): except: pass def Init(self, *_args, **_kwargs): - val = apply(fontsc.wxEncodingConverter_Init,(self,) + _args, _kwargs) + val = fontsc.wxEncodingConverter_Init(self, *_args, **_kwargs) return val def Convert(self, *_args, **_kwargs): - val = apply(fontsc.wxEncodingConverter_Convert,(self,) + _args, _kwargs) + val = fontsc.wxEncodingConverter_Convert(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxEncodingConverter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.IsOk() class wxEncodingConverter(wxEncodingConverterPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(fontsc.new_wxEncodingConverter,_args,_kwargs) + self.this = fontsc.new_wxEncodingConverter(*_args,**_kwargs) self.thisown = 1 @@ -411,22 +413,26 @@ class wxEncodingConverter(wxEncodingConverterPtr): #-------------- FUNCTION WRAPPERS ------------------ def wxGetLocale(*_args, **_kwargs): - val = apply(fontsc.wxGetLocale,_args,_kwargs) + val = fontsc.wxGetLocale(*_args,**_kwargs) if val: val = wxLocalePtr(val) return val wxGetTranslation = fontsc.wxGetTranslation def wxFontMapper_Get(*_args, **_kwargs): - val = apply(fontsc.wxFontMapper_Get,_args,_kwargs) + val = fontsc.wxFontMapper_Get(*_args,**_kwargs) if val: val = wxFontMapperPtr(val) return val def wxFontMapper_Set(*_args, **_kwargs): - val = apply(fontsc.wxFontMapper_Set,_args,_kwargs) + val = fontsc.wxFontMapper_Set(*_args,**_kwargs) if val: val = wxFontMapperPtr(val) return val +wxFontMapper_GetSupportedEncodingsCount = fontsc.wxFontMapper_GetSupportedEncodingsCount + +wxFontMapper_GetEncoding = fontsc.wxFontMapper_GetEncoding + wxFontMapper_GetEncodingName = fontsc.wxFontMapper_GetEncodingName wxFontMapper_GetEncodingDescription = fontsc.wxFontMapper_GetEncodingDescription @@ -446,12 +452,14 @@ wxLocale_GetSystemEncodingName = fontsc.wxLocale_GetSystemEncodingName wxLocale_AddCatalogLookupPathPrefix = fontsc.wxLocale_AddCatalogLookupPathPrefix def wxLocale_GetLanguageInfo(*_args, **_kwargs): - val = apply(fontsc.wxLocale_GetLanguageInfo,_args,_kwargs) + val = fontsc.wxLocale_GetLanguageInfo(*_args,**_kwargs) if val: val = wxLanguageInfoPtr(val) return val +wxLocale_GetLanguageName = fontsc.wxLocale_GetLanguageName + def wxLocale_FindLanguageInfo(*_args, **_kwargs): - val = apply(fontsc.wxLocale_FindLanguageInfo,_args,_kwargs) + val = fontsc.wxLocale_FindLanguageInfo(*_args,**_kwargs) if val: val = wxLanguageInfoPtr(val) return val diff --git a/wxPython/src/msw/frames.cpp b/wxPython/src/msw/frames.cpp index 4c967a909b..e44efd66c2 100644 --- a/wxPython/src/msw/frames.cpp +++ b/wxPython/src/msw/frames.cpp @@ -685,6 +685,42 @@ static PyObject *_wrap_wxTopLevelWindow_GetTitle(PyObject *self, PyObject *args, return _resultobj; } +#define wxTopLevelWindow_SetShape(_swigobj,_swigarg0) (_swigobj->SetShape(_swigarg0)) +static PyObject *_wrap_wxTopLevelWindow_SetShape(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxTopLevelWindow * _arg0; + wxRegion * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","region", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTopLevelWindow_SetShape",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTopLevelWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTopLevelWindow_SetShape. Expected _wxTopLevelWindow_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTopLevelWindow_SetShape. Expected _wxRegion_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxTopLevelWindow_SetShape(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxFrameTowxTopLevelWindow(void *ptr) { wxFrame *src; wxTopLevelWindow *dest; @@ -1395,7 +1431,7 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args, PyO PyObject * _resultobj; wxToolBar * _result; wxFrame * _arg0; - long _arg1 = (long ) wxNO_BORDER|wxTB_HORIZONTAL; + long _arg1 = (long ) -1; wxWindowID _arg2 = (wxWindowID ) -1; wxString * _arg3 = (wxString *) &wxPyToolBarNameStr; PyObject * _argo0 = 0; @@ -1525,6 +1561,72 @@ static PyObject *_wrap_wxFrame_SendSizeEvent(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxFrame_DoMenuUpdates(_swigobj,_swigarg0) (_swigobj->DoMenuUpdates(_swigarg0)) +static PyObject *_wrap_wxFrame_DoMenuUpdates(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFrame * _arg0; + wxMenu * _arg1 = (wxMenu *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","menu", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFrame_DoMenuUpdates",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_DoMenuUpdates. Expected _wxFrame_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_DoMenuUpdates. Expected _wxMenu_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxFrame_DoMenuUpdates(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFrame_UpdateWindowUI(_swigobj,_swigarg0) (_swigobj->UpdateWindowUI(_swigarg0)) +static PyObject *_wrap_wxFrame_UpdateWindowUI(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFrame * _arg0; + long _arg1 = (long ) wxUPDATE_UI_NONE; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","flags", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|l:wxFrame_UpdateWindowUI",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_UpdateWindowUI. Expected _wxFrame_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxFrame_UpdateWindowUI(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxDialogTowxTopLevelWindow(void *ptr) { wxDialog *src; wxTopLevelWindow *dest; @@ -2613,6 +2715,8 @@ static PyMethodDef framescMethods[] = { { "wxDialog_Create", (PyCFunction) _wrap_wxDialog_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreDialog", (PyCFunction) _wrap_new_wxPreDialog, METH_VARARGS | METH_KEYWORDS }, { "new_wxDialog", (PyCFunction) _wrap_new_wxDialog, METH_VARARGS | METH_KEYWORDS }, + { "wxFrame_UpdateWindowUI", (PyCFunction) _wrap_wxFrame_UpdateWindowUI, METH_VARARGS | METH_KEYWORDS }, + { "wxFrame_DoMenuUpdates", (PyCFunction) _wrap_wxFrame_DoMenuUpdates, METH_VARARGS | METH_KEYWORDS }, { "wxFrame_SendSizeEvent", (PyCFunction) _wrap_wxFrame_SendSizeEvent, METH_VARARGS | METH_KEYWORDS }, { "wxFrame_SetToolBar", (PyCFunction) _wrap_wxFrame_SetToolBar, METH_VARARGS | METH_KEYWORDS }, { "wxFrame_GetToolBar", (PyCFunction) _wrap_wxFrame_GetToolBar, METH_VARARGS | METH_KEYWORDS }, @@ -2634,6 +2738,7 @@ static PyMethodDef framescMethods[] = { { "wxFrame_Create", (PyCFunction) _wrap_wxFrame_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreFrame", (PyCFunction) _wrap_new_wxPreFrame, METH_VARARGS | METH_KEYWORDS }, { "new_wxFrame", (PyCFunction) _wrap_new_wxFrame, METH_VARARGS | METH_KEYWORDS }, + { "wxTopLevelWindow_SetShape", (PyCFunction) _wrap_wxTopLevelWindow_SetShape, METH_VARARGS | METH_KEYWORDS }, { "wxTopLevelWindow_GetTitle", (PyCFunction) _wrap_wxTopLevelWindow_GetTitle, METH_VARARGS | METH_KEYWORDS }, { "wxTopLevelWindow_SetTitle", (PyCFunction) _wrap_wxTopLevelWindow_SetTitle, METH_VARARGS | METH_KEYWORDS }, { "wxTopLevelWindow_IsFullScreen", (PyCFunction) _wrap_wxTopLevelWindow_IsFullScreen, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/frames.py b/wxPython/src/msw/frames.py index 0fae1a5d20..49c614d0c2 100644 --- a/wxPython/src/msw/frames.py +++ b/wxPython/src/msw/frames.py @@ -22,57 +22,60 @@ class wxTopLevelWindowPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_Create,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_Create(self, *_args, **_kwargs) return val def Maximize(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_Maximize,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_Maximize(self, *_args, **_kwargs) return val def Restore(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_Restore,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_Restore(self, *_args, **_kwargs) return val def Iconize(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_Iconize,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_Iconize(self, *_args, **_kwargs) return val def IsMaximized(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_IsMaximized,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_IsMaximized(self, *_args, **_kwargs) return val def IsIconized(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_IsIconized,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_IsIconized(self, *_args, **_kwargs) return val def GetIcon(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_GetIcon,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_GetIcon(self, *_args, **_kwargs) if val: val = wxIconPtr(val) ; val.thisown = 1 return val def SetIcon(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_SetIcon,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_SetIcon(self, *_args, **_kwargs) return val def SetIcons(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_SetIcons,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_SetIcons(self, *_args, **_kwargs) return val def ShowFullScreen(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_ShowFullScreen,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_ShowFullScreen(self, *_args, **_kwargs) return val def IsFullScreen(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_IsFullScreen,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_IsFullScreen(self, *_args, **_kwargs) return val def SetTitle(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_SetTitle,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_SetTitle(self, *_args, **_kwargs) return val def GetTitle(self, *_args, **_kwargs): - val = apply(framesc.wxTopLevelWindow_GetTitle,(self,) + _args, _kwargs) + val = framesc.wxTopLevelWindow_GetTitle(self, *_args, **_kwargs) + return val + def SetShape(self, *_args, **_kwargs): + val = framesc.wxTopLevelWindow_SetShape(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTopLevelWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTopLevelWindow(wxTopLevelWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(framesc.new_wxTopLevelWindow,_args,_kwargs) + self.this = framesc.new_wxTopLevelWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreTopLevelWindow(*_args,**_kwargs): - val = wxTopLevelWindowPtr(apply(framesc.new_wxPreTopLevelWindow,_args,_kwargs)) + val = wxTopLevelWindowPtr(framesc.new_wxPreTopLevelWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -83,76 +86,82 @@ class wxFramePtr(wxTopLevelWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_Create,(self,) + _args, _kwargs) + val = framesc.wxFrame_Create(self, *_args, **_kwargs) return val def GetClientAreaOrigin(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_GetClientAreaOrigin,(self,) + _args, _kwargs) + val = framesc.wxFrame_GetClientAreaOrigin(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def SetMenuBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_SetMenuBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_SetMenuBar(self, *_args, **_kwargs) return val def GetMenuBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_GetMenuBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_GetMenuBar(self, *_args, **_kwargs) return val def ProcessCommand(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_ProcessCommand,(self,) + _args, _kwargs) + val = framesc.wxFrame_ProcessCommand(self, *_args, **_kwargs) return val def CreateStatusBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_CreateStatusBar(self, *_args, **_kwargs) return val def GetStatusBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_GetStatusBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_GetStatusBar(self, *_args, **_kwargs) return val def SetStatusBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_SetStatusBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_SetStatusBar(self, *_args, **_kwargs) return val def SetStatusText(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_SetStatusText,(self,) + _args, _kwargs) + val = framesc.wxFrame_SetStatusText(self, *_args, **_kwargs) return val def SetStatusWidths(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_SetStatusWidths,(self,) + _args, _kwargs) + val = framesc.wxFrame_SetStatusWidths(self, *_args, **_kwargs) return val def PushStatusText(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_PushStatusText,(self,) + _args, _kwargs) + val = framesc.wxFrame_PushStatusText(self, *_args, **_kwargs) return val def PopStatusText(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_PopStatusText,(self,) + _args, _kwargs) + val = framesc.wxFrame_PopStatusText(self, *_args, **_kwargs) return val def DoGiveHelp(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_DoGiveHelp,(self,) + _args, _kwargs) + val = framesc.wxFrame_DoGiveHelp(self, *_args, **_kwargs) return val def SetStatusBarPane(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_SetStatusBarPane,(self,) + _args, _kwargs) + val = framesc.wxFrame_SetStatusBarPane(self, *_args, **_kwargs) return val def GetStatusBarPane(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_GetStatusBarPane,(self,) + _args, _kwargs) + val = framesc.wxFrame_GetStatusBarPane(self, *_args, **_kwargs) return val def CreateToolBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_CreateToolBar(self, *_args, **_kwargs) return val def GetToolBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_GetToolBar(self, *_args, **_kwargs) return val def SetToolBar(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_SetToolBar,(self,) + _args, _kwargs) + val = framesc.wxFrame_SetToolBar(self, *_args, **_kwargs) return val def SendSizeEvent(self, *_args, **_kwargs): - val = apply(framesc.wxFrame_SendSizeEvent,(self,) + _args, _kwargs) + val = framesc.wxFrame_SendSizeEvent(self, *_args, **_kwargs) + return val + def DoMenuUpdates(self, *_args, **_kwargs): + val = framesc.wxFrame_DoMenuUpdates(self, *_args, **_kwargs) + return val + def UpdateWindowUI(self, *_args, **_kwargs): + val = framesc.wxFrame_UpdateWindowUI(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) Command = ProcessCommand class wxFrame(wxFramePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(framesc.new_wxFrame,_args,_kwargs) + self.this = framesc.new_wxFrame(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreFrame(*_args,**_kwargs): - val = wxFramePtr(apply(framesc.new_wxPreFrame,_args,_kwargs)) + val = wxFramePtr(framesc.new_wxPreFrame(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -163,47 +172,47 @@ class wxDialogPtr(wxTopLevelWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_Create,(self,) + _args, _kwargs) + val = framesc.wxDialog_Create(self, *_args, **_kwargs) return val def Centre(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_Centre,(self,) + _args, _kwargs) + val = framesc.wxDialog_Centre(self, *_args, **_kwargs) return val def EndModal(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_EndModal,(self,) + _args, _kwargs) + val = framesc.wxDialog_EndModal(self, *_args, **_kwargs) return val def SetModal(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_SetModal,(self,) + _args, _kwargs) + val = framesc.wxDialog_SetModal(self, *_args, **_kwargs) return val def IsModal(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_IsModal,(self,) + _args, _kwargs) + val = framesc.wxDialog_IsModal(self, *_args, **_kwargs) return val def ShowModal(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_ShowModal,(self,) + _args, _kwargs) + val = framesc.wxDialog_ShowModal(self, *_args, **_kwargs) return val def GetReturnCode(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_GetReturnCode,(self,) + _args, _kwargs) + val = framesc.wxDialog_GetReturnCode(self, *_args, **_kwargs) return val def SetReturnCode(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_SetReturnCode,(self,) + _args, _kwargs) + val = framesc.wxDialog_SetReturnCode(self, *_args, **_kwargs) return val def CreateTextSizer(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs) + val = framesc.wxDialog_CreateTextSizer(self, *_args, **_kwargs) return val def CreateButtonSizer(self, *_args, **_kwargs): - val = apply(framesc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs) + val = framesc.wxDialog_CreateButtonSizer(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDialog(wxDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(framesc.new_wxDialog,_args,_kwargs) + self.this = framesc.new_wxDialog(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreDialog(*_args,**_kwargs): - val = wxDialogPtr(apply(framesc.new_wxPreDialog,_args,_kwargs)) + val = wxDialogPtr(framesc.new_wxPreDialog(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -214,20 +223,20 @@ class wxMiniFramePtr(wxFramePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(framesc.wxMiniFrame_Create,(self,) + _args, _kwargs) + val = framesc.wxMiniFrame_Create(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMiniFrame(wxMiniFramePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(framesc.new_wxMiniFrame,_args,_kwargs) + self.this = framesc.new_wxMiniFrame(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreMiniFrame(*_args,**_kwargs): - val = wxMiniFramePtr(apply(framesc.new_wxPreMiniFrame,_args,_kwargs)) + val = wxMiniFramePtr(framesc.new_wxPreMiniFrame(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -238,17 +247,17 @@ class wxSplashScreenWindowPtr(wxWindowPtr): self.this = this self.thisown = 0 def SetBitmap(self, *_args, **_kwargs): - val = apply(framesc.wxSplashScreenWindow_SetBitmap,(self,) + _args, _kwargs) + val = framesc.wxSplashScreenWindow_SetBitmap(self, *_args, **_kwargs) return val def GetBitmap(self, *_args, **_kwargs): - val = apply(framesc.wxSplashScreenWindow_GetBitmap,(self,) + _args, _kwargs) + val = framesc.wxSplashScreenWindow_GetBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSplashScreenWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSplashScreenWindow(wxSplashScreenWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(framesc.new_wxSplashScreenWindow,_args,_kwargs) + self.this = framesc.new_wxSplashScreenWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -260,20 +269,20 @@ class wxSplashScreenPtr(wxFramePtr): self.this = this self.thisown = 0 def GetSplashStyle(self, *_args, **_kwargs): - val = apply(framesc.wxSplashScreen_GetSplashStyle,(self,) + _args, _kwargs) + val = framesc.wxSplashScreen_GetSplashStyle(self, *_args, **_kwargs) return val def GetSplashWindow(self, *_args, **_kwargs): - val = apply(framesc.wxSplashScreen_GetSplashWindow,(self,) + _args, _kwargs) + val = framesc.wxSplashScreen_GetSplashWindow(self, *_args, **_kwargs) if val: val = wxSplashScreenWindowPtr(val) return val def GetTimeout(self, *_args, **_kwargs): - val = apply(framesc.wxSplashScreen_GetTimeout,(self,) + _args, _kwargs) + val = framesc.wxSplashScreen_GetTimeout(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSplashScreen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSplashScreen(wxSplashScreenPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(framesc.new_wxSplashScreen,_args,_kwargs) + self.this = framesc.new_wxSplashScreen(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp index f13ea16d9e..ac8ac7f28f 100644 --- a/wxPython/src/msw/gdi.cpp +++ b/wxPython/src/msw/gdi.cpp @@ -61,6 +61,7 @@ extern PyObject *SWIG_newvarlink(void); #include #include #include +#include #include @@ -179,17 +180,30 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { icon->CopyFromBitmap(bmp); return icon; } - // Alternate 'constructor' + + wxIcon* wxIconFromLocation(const wxIconLocation& loc) { + wxIcon* icon = new wxIcon(loc); + return icon; + } + wxCursor* wxPyStockCursor(int id) { return new wxCursor(id); } wxCursor* wxCursorFromImage(const wxImage& image) { - #ifndef __WXMAC__ return new wxCursor(image); - #else - return NULL; - #endif + } + + wxCursor* wxCursorFromBits(PyObject* bits, int width, int height, + int hotSpotX=-1, int hotSpotY=-1, + PyObject* maskBits=0) { + char* bitsbuf; + char* maskbuf = NULL; + int length; + PyString_AsStringAndSize(bits, &bitsbuf, &length); + if (maskBits) + PyString_AsStringAndSize(maskBits, &maskbuf, &length); + return new wxCursor(bitsbuf, width, height, hotSpotX, hotSpotY, maskbuf); } // Alternate 'constructor' wxColour* wxNamedColour(const wxString& colorName) { @@ -538,6 +552,39 @@ static PyObject *_wrap_wxIconFromBitmap(PyObject *self, PyObject *args, PyObject return _resultobj; } +static PyObject *_wrap_wxIconFromLocation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIcon * _result; + wxIconLocation * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "loc", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconFromLocation",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconFromLocation. Expected _wxIconLocation_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxIcon *)wxIconFromLocation(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxCursor * _result; @@ -597,6 +644,46 @@ static PyObject *_wrap_wxCursorFromImage(PyObject *self, PyObject *args, PyObjec return _resultobj; } +static PyObject *_wrap_wxCursorFromBits(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _result; + PyObject * _arg0; + int _arg1; + int _arg2; + int _arg3 = (int ) -1; + int _arg4 = (int ) -1; + PyObject * _arg5 = (PyObject *) 0; + PyObject * _obj0 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "bits","width","height","hotSpotX","hotSpotY","maskBits", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|iiO:wxCursorFromBits",_kwnames,&_obj0,&_arg1,&_arg2,&_arg3,&_arg4,&_obj5)) + return NULL; +{ + _arg0 = _obj0; +} + if (_obj5) +{ + _arg5 = _obj5; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxCursor *)wxCursorFromBits(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + static PyObject *_wrap_wxNamedColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; @@ -2801,6 +2888,251 @@ static PyObject *_wrap_wxIcon_CopyFromBitmap(PyObject *self, PyObject *args, PyO return _resultobj; } +static wxIconLocation *new_wxIconLocation(const wxString *filename,int num) { +#ifdef __WXMSW__ + return new wxIconLocation(*filename, num); +#else + return new wxIconLocation(*filename); +#endif + } + +static PyObject *_wrap_new_wxIconLocation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIconLocation * _result; + wxString * _arg0 = (wxString *) &wxPyEmptyString; + int _arg1 = (int ) 0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "filename","num", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|Oi:new_wxIconLocation",_kwnames,&_obj0,&_arg1)) + return NULL; + if (_obj0) +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxIconLocation *)new_wxIconLocation(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxIconLocation_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +#define delete_wxIconLocation(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxIconLocation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIconLocation * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxIconLocation",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxIconLocation. Expected _wxIconLocation_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxIconLocation(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxIconLocation_IsOk(_swigobj) (_swigobj->IsOk()) +static PyObject *_wrap_wxIconLocation_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxIconLocation * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconLocation_IsOk",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_IsOk. Expected _wxIconLocation_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxIconLocation_IsOk(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxIconLocation_SetFileName(_swigobj,_swigarg0) (_swigobj->SetFileName(_swigarg0)) +static PyObject *_wrap_wxIconLocation_SetFileName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIconLocation * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","filename", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxIconLocation_SetFileName",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_SetFileName. Expected _wxIconLocation_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxIconLocation_SetFileName(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxIconLocation_GetFileName(_swigobj) (_swigobj->GetFileName()) +static PyObject *_wrap_wxIconLocation_GetFileName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxIconLocation * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconLocation_GetFileName",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_GetFileName. Expected _wxIconLocation_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxString & _result_ref = wxIconLocation_GetFileName(_arg0); + _result = (wxString *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} + return _resultobj; +} + +static void wxIconLocation_SetIndex(wxIconLocation *self,int num) { +#ifdef __WXMSW__ + self->SetIndex(num); +#else + // do nothing +#endif + } +static PyObject *_wrap_wxIconLocation_SetIndex(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIconLocation * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","num", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIconLocation_SetIndex",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_SetIndex. Expected _wxIconLocation_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxIconLocation_SetIndex(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static int wxIconLocation_GetIndex(wxIconLocation *self) { +#ifdef __WXMSW__ + return self->GetIndex(); +#else + return -1; +#endif + } +static PyObject *_wrap_wxIconLocation_GetIndex(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxIconLocation * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconLocation_GetIndex",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_GetIndex. Expected _wxIconLocation_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxIconLocation_GetIndex(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define new_wxIconBundle() (new wxIconBundle()) static PyObject *_wrap_new_wxIconBundle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3063,7 +3395,15 @@ static void *SwigwxCursorTowxObject(void *ptr) { return (void *) dest; } -#define new_wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static wxCursor *new_wxCursor(const wxString *cursorName,long flags,int hotSpotX,int hotSpotY) { +#ifdef __WXGTK__ + wxCHECK_MSG(FALSE, NULL, + wxT("wxCursor constructor not implemented for wxGTK, use wxStockCursor, wxCursorFromImage, or wxCursorFromBits instead.")); +#else + return new wxCursor(*cursorName, flags, hotSpotX, hotSpotY); +#endif + } + static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxCursor * _result; @@ -3085,7 +3425,7 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args, PyObject *kw } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxCursor *)new_wxCursor(*_arg0,_arg1,_arg2,_arg3); + _result = (wxCursor *)new_wxCursor(_arg0,_arg1,_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3800,6 +4140,52 @@ static PyObject *_wrap_wxColourDatabase_FindColour(PyObject *self, PyObject *arg return _resultobj; } +#define wxColourDatabase_FindColourNoAdd(_swigobj,_swigarg0) (_swigobj->FindColourNoAdd(_swigarg0)) +static PyObject *_wrap_wxColourDatabase_FindColourNoAdd(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxColourDatabase * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","colour", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxColourDatabase_FindColourNoAdd",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDatabase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDatabase_FindColourNoAdd. Expected _wxColourDatabase_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxColour *)wxColourDatabase_FindColourNoAdd(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxColourDatabase_FindName(_swigobj,_swigarg0) (_swigobj->FindName(_swigarg0)) static PyObject *_wrap_wxColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3845,27 +4231,60 @@ static PyObject *_wrap_wxColourDatabase_FindName(PyObject *self, PyObject *args, return _resultobj; } -static void wxColourDatabase_Append(wxColourDatabase *self,const wxString & name,int red,int green,int blue) { - // first see if the name is already there - wxString cName = name; - cName.MakeUpper(); - wxString cName2 = cName; - if ( !cName2.Replace(wxT("GRAY"), wxT("GREY")) ) - cName2.clear(); - - wxNode *node = self->GetFirst(); - while ( node ) { - const wxChar *key = node->GetKeyString(); - if ( cName == key || cName2 == key ) { - wxColour* c = (wxColour *)node->GetData(); - c->Set(red, green, blue); - return; - } - node = node->GetNext(); - } +static void wxColourDatabase_AddColour(wxColourDatabase *self,const wxString & name,wxColour * colour) { + // make a copy since the python one will be GC'd + wxColour* c = new wxColour(*colour); + self->AddColour(name, c); + } +static PyObject *_wrap_wxColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColourDatabase * _arg0; + wxString * _arg1; + wxColour * _arg2; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + wxColour temp; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","name","colour", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxColourDatabase_AddColour",_kwnames,&_argo0,&_obj1,&_obj2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDatabase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDatabase_AddColour. Expected _wxColourDatabase_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + _arg2 = &temp; + if (! wxColour_helper(_obj2, &_arg2)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxColourDatabase_AddColour(_arg0,*_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} - // otherwise append the new colour - self->Append(name.c_str(), new wxColour(red, green, blue)); +static void wxColourDatabase_Append(wxColourDatabase *self,const wxString & name,int red,int green,int blue) { + wxColour* c = new wxColour(red, green, blue); + self->AddColour(name, c); } static PyObject *_wrap_wxColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -9403,6 +9822,59 @@ static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args, PyObject * return _resultobj; } +static void *SwigwxMirrorDCTowxDC(void *ptr) { + wxMirrorDC *src; + wxDC *dest; + src = (wxMirrorDC *) ptr; + dest = (wxDC *) src; + return (void *) dest; +} + +static void *SwigwxMirrorDCTowxObject(void *ptr) { + wxMirrorDC *src; + wxObject *dest; + src = (wxMirrorDC *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxMirrorDC(_swigarg0,_swigarg1) (new wxMirrorDC(_swigarg0,_swigarg1)) +static PyObject *_wrap_new_wxMirrorDC(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMirrorDC * _result; + wxDC * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "dc","mirror", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:new_wxMirrorDC",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMirrorDC. Expected _wxDC_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxMirrorDC *)new_wxMirrorDC(*_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxMirrorDC_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + static void *SwigwxMetaFileTowxObject(void *ptr) { wxMetaFile *src; wxObject *dest; @@ -10492,6 +10964,50 @@ static PyObject *_wrap_new_wxRegionFromPoints(PyObject *self, PyObject *args, Py return _resultobj; } +#define new_wxRegionFromBitmap(_swigarg0,_swigarg1,_swigarg2) (new wxRegion(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_new_wxRegionFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxRegion * _result; + wxBitmap * _arg0; + wxColour * _arg1 = (wxColour *) &wxNullColour; + int _arg2 = (int ) 0; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "bmp","transColour","tolerance", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|Oi:new_wxRegionFromBitmap",_kwnames,&_argo0,&_obj1,&_arg2)) + return NULL; + if (_argo0) { + if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRegionFromBitmap. Expected _wxBitmap_p."); + return NULL; + } + } + if (_obj1) +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxRegion *)new_wxRegionFromBitmap(*_arg0,*_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegion_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + #define delete_wxRegion(_swigobj) (delete _swigobj) static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -11186,6 +11702,82 @@ static PyObject *_wrap_wxRegion_XorRegion(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxRegion_ConvertToBitmap(_swigobj) (_swigobj->ConvertToBitmap()) +static PyObject *_wrap_wxRegion_ConvertToBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _result; + wxRegion * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegion_ConvertToBitmap",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ConvertToBitmap. Expected _wxRegion_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxBitmap (wxRegion_ConvertToBitmap(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxRegion_UnionBitmap(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Union(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxRegion_UnionBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxRegion * _arg0; + wxBitmap * _arg1; + wxColour * _arg2 = (wxColour *) &wxNullColour; + int _arg3 = (int ) 0; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + wxColour temp; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","bmp","transColour","tolerance", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|Oi:wxRegion_UnionBitmap",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_UnionBitmap. Expected _wxRegion_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_UnionBitmap. Expected _wxBitmap_p."); + return NULL; + } + } + if (_obj2) +{ + _arg2 = &temp; + if (! wxColour_helper(_obj2, &_arg2)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxRegion_UnionBitmap(_arg0,*_arg1,*_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxRegionIteratorTowxObject(void *ptr) { wxRegionIterator *src; wxObject *dest; @@ -11553,6 +12145,8 @@ static PyMethodDef gdicMethods[] = { { "wxRegionIterator_GetX", (PyCFunction) _wrap_wxRegionIterator_GetX, METH_VARARGS | METH_KEYWORDS }, { "delete_wxRegionIterator", (PyCFunction) _wrap_delete_wxRegionIterator, METH_VARARGS | METH_KEYWORDS }, { "new_wxRegionIterator", (PyCFunction) _wrap_new_wxRegionIterator, METH_VARARGS | METH_KEYWORDS }, + { "wxRegion_UnionBitmap", (PyCFunction) _wrap_wxRegion_UnionBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxRegion_ConvertToBitmap", (PyCFunction) _wrap_wxRegion_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxRegion_XorRegion", (PyCFunction) _wrap_wxRegion_XorRegion, METH_VARARGS | METH_KEYWORDS }, { "wxRegion_XorRect", (PyCFunction) _wrap_wxRegion_XorRect, METH_VARARGS | METH_KEYWORDS }, { "wxRegion_Xor", (PyCFunction) _wrap_wxRegion_Xor, METH_VARARGS | METH_KEYWORDS }, @@ -11574,6 +12168,7 @@ static PyMethodDef gdicMethods[] = { { "wxRegion_Offset", (PyCFunction) _wrap_wxRegion_Offset, METH_VARARGS | METH_KEYWORDS }, { "wxRegion_Clear", (PyCFunction) _wrap_wxRegion_Clear, METH_VARARGS | METH_KEYWORDS }, { "delete_wxRegion", (PyCFunction) _wrap_delete_wxRegion, METH_VARARGS | METH_KEYWORDS }, + { "new_wxRegionFromBitmap", (PyCFunction) _wrap_new_wxRegionFromBitmap, METH_VARARGS | METH_KEYWORDS }, { "new_wxRegionFromPoints", (PyCFunction) _wrap_new_wxRegionFromPoints, METH_VARARGS | METH_KEYWORDS }, { "new_wxRegion", (PyCFunction) _wrap_new_wxRegion, METH_VARARGS | METH_KEYWORDS }, { "wxImageList_GetSize", (PyCFunction) _wrap_wxImageList_GetSize, METH_VARARGS | METH_KEYWORDS }, @@ -11602,6 +12197,7 @@ static PyMethodDef gdicMethods[] = { { "wxMetaFile_Ok", (PyCFunction) _wrap_wxMetaFile_Ok, METH_VARARGS | METH_KEYWORDS }, { "delete_wxMetaFile", (PyCFunction) _wrap_delete_wxMetaFile, METH_VARARGS | METH_KEYWORDS }, { "new_wxMetaFile", (PyCFunction) _wrap_new_wxMetaFile, METH_VARARGS | METH_KEYWORDS }, + { "new_wxMirrorDC", (PyCFunction) _wrap_new_wxMirrorDC, METH_VARARGS | METH_KEYWORDS }, { "new_wxWindowDC", (PyCFunction) _wrap_new_wxWindowDC, METH_VARARGS | METH_KEYWORDS }, { "new_wxPaintDC", (PyCFunction) _wrap_new_wxPaintDC, METH_VARARGS | METH_KEYWORDS }, { "new_wxClientDC", (PyCFunction) _wrap_new_wxClientDC, METH_VARARGS | METH_KEYWORDS }, @@ -11752,7 +12348,9 @@ static PyMethodDef gdicMethods[] = { { "delete_wxPen", (PyCFunction) _wrap_delete_wxPen, METH_VARARGS | METH_KEYWORDS }, { "new_wxPen", (PyCFunction) _wrap_new_wxPen, METH_VARARGS | METH_KEYWORDS }, { "wxColourDatabase_Append", (PyCFunction) _wrap_wxColourDatabase_Append, METH_VARARGS | METH_KEYWORDS }, + { "wxColourDatabase_AddColour", (PyCFunction) _wrap_wxColourDatabase_AddColour, METH_VARARGS | METH_KEYWORDS }, { "wxColourDatabase_FindName", (PyCFunction) _wrap_wxColourDatabase_FindName, METH_VARARGS | METH_KEYWORDS }, + { "wxColourDatabase_FindColourNoAdd", (PyCFunction) _wrap_wxColourDatabase_FindColourNoAdd, METH_VARARGS | METH_KEYWORDS }, { "wxColourDatabase_FindColour", (PyCFunction) _wrap_wxColourDatabase_FindColour, METH_VARARGS | METH_KEYWORDS }, { "wxColour___ne__", (PyCFunction) _wrap_wxColour___ne__, METH_VARARGS | METH_KEYWORDS }, { "wxColour___eq__", (PyCFunction) _wrap_wxColour___eq__, METH_VARARGS | METH_KEYWORDS }, @@ -11783,6 +12381,13 @@ static PyMethodDef gdicMethods[] = { { "new_wxIconBundleFromIcon", (PyCFunction) _wrap_new_wxIconBundleFromIcon, METH_VARARGS | METH_KEYWORDS }, { "new_wxIconBundleFromFile", (PyCFunction) _wrap_new_wxIconBundleFromFile, METH_VARARGS | METH_KEYWORDS }, { "new_wxIconBundle", (PyCFunction) _wrap_new_wxIconBundle, METH_VARARGS | METH_KEYWORDS }, + { "wxIconLocation_GetIndex", (PyCFunction) _wrap_wxIconLocation_GetIndex, METH_VARARGS | METH_KEYWORDS }, + { "wxIconLocation_SetIndex", (PyCFunction) _wrap_wxIconLocation_SetIndex, METH_VARARGS | METH_KEYWORDS }, + { "wxIconLocation_GetFileName", (PyCFunction) _wrap_wxIconLocation_GetFileName, METH_VARARGS | METH_KEYWORDS }, + { "wxIconLocation_SetFileName", (PyCFunction) _wrap_wxIconLocation_SetFileName, METH_VARARGS | METH_KEYWORDS }, + { "wxIconLocation_IsOk", (PyCFunction) _wrap_wxIconLocation_IsOk, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxIconLocation", (PyCFunction) _wrap_delete_wxIconLocation, METH_VARARGS | METH_KEYWORDS }, + { "new_wxIconLocation", (PyCFunction) _wrap_new_wxIconLocation, METH_VARARGS | METH_KEYWORDS }, { "wxIcon_CopyFromBitmap", (PyCFunction) _wrap_wxIcon_CopyFromBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxIcon_SetSize", (PyCFunction) _wrap_wxIcon_SetSize, METH_VARARGS | METH_KEYWORDS }, { "wxIcon_SetDepth", (PyCFunction) _wrap_wxIcon_SetDepth, METH_VARARGS | METH_KEYWORDS }, @@ -11829,8 +12434,10 @@ static PyMethodDef gdicMethods[] = { { "new_wxGDIObject", (PyCFunction) _wrap_new_wxGDIObject, METH_VARARGS | METH_KEYWORDS }, { "wxMemoryDCFromDC", (PyCFunction) _wrap_wxMemoryDCFromDC, METH_VARARGS | METH_KEYWORDS }, { "wxNamedColour", (PyCFunction) _wrap_wxNamedColour, METH_VARARGS | METH_KEYWORDS }, + { "wxCursorFromBits", (PyCFunction) _wrap_wxCursorFromBits, METH_VARARGS | METH_KEYWORDS }, { "wxCursorFromImage", (PyCFunction) _wrap_wxCursorFromImage, METH_VARARGS | METH_KEYWORDS }, { "wxStockCursor", (PyCFunction) _wrap_wxStockCursor, METH_VARARGS | METH_KEYWORDS }, + { "wxIconFromLocation", (PyCFunction) _wrap_wxIconFromLocation, METH_VARARGS | METH_KEYWORDS }, { "wxIconFromBitmap", (PyCFunction) _wrap_wxIconFromBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxIconFromXPMData", (PyCFunction) _wrap_wxIconFromXPMData, METH_VARARGS | METH_KEYWORDS }, { "wxEmptyIcon", (PyCFunction) _wrap_wxEmptyIcon, METH_VARARGS | METH_KEYWORDS }, @@ -11871,6 +12478,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxGDIObject","_wxIcon",SwigwxIconTowxGDIObject}, { "_wxGDIObject","_wxBitmap",SwigwxBitmapTowxGDIObject}, { "_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC}, + { "_wxDC","_wxMirrorDC",SwigwxMirrorDCTowxDC}, { "_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC}, { "_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC}, { "_wxDC","_wxClientDC",SwigwxClientDCTowxDC}, @@ -11919,6 +12527,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxObject","_wxPalette",SwigwxPaletteTowxObject}, { "_wxObject","_wxMetaFileDC",SwigwxMetaFileDCTowxObject}, { "_wxObject","_wxMetaFile",SwigwxMetaFileTowxObject}, + { "_wxObject","_wxMirrorDC",SwigwxMirrorDCTowxObject}, { "_wxObject","_wxWindowDC",SwigwxWindowDCTowxObject}, { "_wxObject","_wxPaintDC",SwigwxPaintDCTowxObject}, { "_wxObject","_wxClientDC",SwigwxClientDCTowxObject}, diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py index c8ef3bc3be..034c0529cd 100644 --- a/wxPython/src/msw/gdi.py +++ b/wxPython/src/msw/gdi.py @@ -16,19 +16,19 @@ class wxGDIObjectPtr(wxObjectPtr): except: pass def GetVisible(self, *_args, **_kwargs): - val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs) + val = gdic.wxGDIObject_GetVisible(self, *_args, **_kwargs) return val def SetVisible(self, *_args, **_kwargs): - val = apply(gdic.wxGDIObject_SetVisible,(self,) + _args, _kwargs) + val = gdic.wxGDIObject_SetVisible(self, *_args, **_kwargs) return val def IsNull(self, *_args, **_kwargs): - val = apply(gdic.wxGDIObject_IsNull,(self,) + _args, _kwargs) + val = gdic.wxGDIObject_IsNull(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGDIObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGDIObject(wxGDIObjectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxGDIObject,_args,_kwargs) + self.this = gdic.new_wxGDIObject(*_args,**_kwargs) self.thisown = 1 @@ -45,81 +45,82 @@ class wxBitmapPtr(wxGDIObjectPtr): except: pass def GetPalette(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetPalette(self, *_args, **_kwargs) if val: val = wxPalettePtr(val) return val def GetMask(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetMask,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetMask(self, *_args, **_kwargs) if val: val = wxMaskPtr(val) return val def LoadFile(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_LoadFile,(self,) + _args, _kwargs) + val = gdic.wxBitmap_LoadFile(self, *_args, **_kwargs) return val def SaveFile(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SaveFile,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SaveFile(self, *_args, **_kwargs) return val def SetMask(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetMask,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetMask(self, *_args, **_kwargs) return val def SetPalette(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetPalette,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetPalette(self, *_args, **_kwargs) return val def GetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetHandle,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetHandle(self, *_args, **_kwargs) return val def SetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetHandle,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetHandle(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_Ok,(self,) + _args, _kwargs) + val = gdic.wxBitmap_Ok(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetWidth,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetHeight,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetHeight(self, *_args, **_kwargs) return val def GetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetDepth,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetDepth(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetWidth,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetWidth(self, *_args, **_kwargs) return val def SetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetHeight,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetHeight(self, *_args, **_kwargs) return val def SetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetDepth,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetDepth(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetSize,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetSize(self, *_args, **_kwargs) return val def GetSubBitmap(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetSubBitmap,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetSubBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def CopyFromIcon(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_CopyFromIcon,(self,) + _args, _kwargs) + val = gdic.wxBitmap_CopyFromIcon(self, *_args, **_kwargs) return val def CopyFromCursor(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_CopyFromCursor,(self,) + _args, _kwargs) + val = gdic.wxBitmap_CopyFromCursor(self, *_args, **_kwargs) return val def GetQuality(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_GetQuality,(self,) + _args, _kwargs) + val = gdic.wxBitmap_GetQuality(self, *_args, **_kwargs) return val def SetQuality(self, *_args, **_kwargs): - val = apply(gdic.wxBitmap_SetQuality,(self,) + _args, _kwargs) + val = gdic.wxBitmap_SetQuality(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def SetMaskColour(self, colour): mask = wxMaskColour(self, colour) self.SetMask(mask) + def __nonzero__(self): return self.Ok() class wxBitmap(wxBitmapPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxBitmap,_args,_kwargs) + self.this = gdic.new_wxBitmap(*_args,**_kwargs) self.thisown = 1 @@ -130,13 +131,13 @@ class wxMaskPtr(wxObjectPtr): self.this = this self.thisown = 0 def Destroy(self, *_args, **_kwargs): - val = apply(gdic.wxMask_Destroy,(self,) + _args, _kwargs) + val = gdic.wxMask_Destroy(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMask(wxMaskPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxMask,_args,_kwargs) + self.this = gdic.new_wxMask(*_args,**_kwargs) self.thisown = 1 @@ -153,46 +154,82 @@ class wxIconPtr(wxGDIObjectPtr): except: pass def LoadFile(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs) + val = gdic.wxIcon_LoadFile(self, *_args, **_kwargs) return val def GetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_GetHandle,(self,) + _args, _kwargs) + val = gdic.wxIcon_GetHandle(self, *_args, **_kwargs) return val def SetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_SetHandle,(self,) + _args, _kwargs) + val = gdic.wxIcon_SetHandle(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs) + val = gdic.wxIcon_Ok(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_GetWidth,(self,) + _args, _kwargs) + val = gdic.wxIcon_GetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs) + val = gdic.wxIcon_GetHeight(self, *_args, **_kwargs) return val def GetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs) + val = gdic.wxIcon_GetDepth(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_SetWidth,(self,) + _args, _kwargs) + val = gdic.wxIcon_SetWidth(self, *_args, **_kwargs) return val def SetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_SetHeight,(self,) + _args, _kwargs) + val = gdic.wxIcon_SetHeight(self, *_args, **_kwargs) return val def SetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_SetDepth,(self,) + _args, _kwargs) + val = gdic.wxIcon_SetDepth(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_SetSize,(self,) + _args, _kwargs) + val = gdic.wxIcon_SetSize(self, *_args, **_kwargs) return val def CopyFromBitmap(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_CopyFromBitmap,(self,) + _args, _kwargs) + val = gdic.wxIcon_CopyFromBitmap(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxIcon(wxIconPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxIcon,_args,_kwargs) + self.this = gdic.new_wxIcon(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxIconLocationPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=gdic.delete_wxIconLocation): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def IsOk(self, *_args, **_kwargs): + val = gdic.wxIconLocation_IsOk(self, *_args, **_kwargs) + return val + def SetFileName(self, *_args, **_kwargs): + val = gdic.wxIconLocation_SetFileName(self, *_args, **_kwargs) + return val + def GetFileName(self, *_args, **_kwargs): + val = gdic.wxIconLocation_GetFileName(self, *_args, **_kwargs) + return val + def SetIndex(self, *_args, **_kwargs): + val = gdic.wxIconLocation_SetIndex(self, *_args, **_kwargs) + return val + def GetIndex(self, *_args, **_kwargs): + val = gdic.wxIconLocation_GetIndex(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxIconLocation(wxIconLocationPtr): + def __init__(self,*_args,**_kwargs): + self.this = gdic.new_wxIconLocation(*_args,**_kwargs) self.thisown = 1 @@ -209,31 +246,31 @@ class wxIconBundlePtr : except: pass def AddIcon(self, *_args, **_kwargs): - val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs) + val = gdic.wxIconBundle_AddIcon(self, *_args, **_kwargs) return val def AddIconFromFile(self, *_args, **_kwargs): - val = apply(gdic.wxIconBundle_AddIconFromFile,(self,) + _args, _kwargs) + val = gdic.wxIconBundle_AddIconFromFile(self, *_args, **_kwargs) return val def GetIcon(self, *_args, **_kwargs): - val = apply(gdic.wxIconBundle_GetIcon,(self,) + _args, _kwargs) + val = gdic.wxIconBundle_GetIcon(self, *_args, **_kwargs) if val: val = wxIconPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxIconBundle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxIconBundle(wxIconBundlePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxIconBundle,_args,_kwargs) + self.this = gdic.new_wxIconBundle(*_args,**_kwargs) self.thisown = 1 def wxIconBundleFromFile(*_args,**_kwargs): - val = wxIconBundlePtr(apply(gdic.new_wxIconBundleFromFile,_args,_kwargs)) + val = wxIconBundlePtr(gdic.new_wxIconBundleFromFile(*_args,**_kwargs)) val.thisown = 1 return val def wxIconBundleFromIcon(*_args,**_kwargs): - val = wxIconBundlePtr(apply(gdic.new_wxIconBundleFromIcon,_args,_kwargs)) + val = wxIconBundlePtr(gdic.new_wxIconBundleFromIcon(*_args,**_kwargs)) val.thisown = 1 return val @@ -249,40 +286,41 @@ class wxCursorPtr(wxGDIObjectPtr): except: pass def GetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_GetHandle,(self,) + _args, _kwargs) + val = gdic.wxCursor_GetHandle(self, *_args, **_kwargs) return val def SetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_SetHandle,(self,) + _args, _kwargs) + val = gdic.wxCursor_SetHandle(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs) + val = gdic.wxCursor_Ok(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_GetWidth,(self,) + _args, _kwargs) + val = gdic.wxCursor_GetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_GetHeight,(self,) + _args, _kwargs) + val = gdic.wxCursor_GetHeight(self, *_args, **_kwargs) return val def GetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_GetDepth,(self,) + _args, _kwargs) + val = gdic.wxCursor_GetDepth(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_SetWidth,(self,) + _args, _kwargs) + val = gdic.wxCursor_SetWidth(self, *_args, **_kwargs) return val def SetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_SetHeight,(self,) + _args, _kwargs) + val = gdic.wxCursor_SetHeight(self, *_args, **_kwargs) return val def SetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_SetDepth,(self,) + _args, _kwargs) + val = gdic.wxCursor_SetDepth(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_SetSize,(self,) + _args, _kwargs) + val = gdic.wxCursor_SetSize(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxCursor(wxCursorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxCursor,_args,_kwargs) + self.this = gdic.new_wxCursor(*_args,**_kwargs) self.thisown = 1 @@ -299,31 +337,31 @@ class wxColourPtr(wxObjectPtr): except: pass def Red(self, *_args, **_kwargs): - val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs) + val = gdic.wxColour_Red(self, *_args, **_kwargs) return val def Green(self, *_args, **_kwargs): - val = apply(gdic.wxColour_Green,(self,) + _args, _kwargs) + val = gdic.wxColour_Green(self, *_args, **_kwargs) return val def Blue(self, *_args, **_kwargs): - val = apply(gdic.wxColour_Blue,(self,) + _args, _kwargs) + val = gdic.wxColour_Blue(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxColour_Ok,(self,) + _args, _kwargs) + val = gdic.wxColour_Ok(self, *_args, **_kwargs) return val def Set(self, *_args, **_kwargs): - val = apply(gdic.wxColour_Set,(self,) + _args, _kwargs) + val = gdic.wxColour_Set(self, *_args, **_kwargs) return val def Get(self, *_args, **_kwargs): - val = apply(gdic.wxColour_Get,(self,) + _args, _kwargs) + val = gdic.wxColour_Get(self, *_args, **_kwargs) return val def __eq__(self, *_args, **_kwargs): - val = apply(gdic.wxColour___eq__,(self,) + _args, _kwargs) + val = gdic.wxColour___eq__(self, *_args, **_kwargs) return val def __ne__(self, *_args, **_kwargs): - val = apply(gdic.wxColour___ne__,(self,) + _args, _kwargs) + val = gdic.wxColour___ne__(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) asTuple = Get def __str__(self): return str(self.asTuple()) def __repr__(self): return 'wxColour:' + str(self.asTuple()) @@ -334,7 +372,7 @@ class wxColourPtr(wxObjectPtr): class wxColour(wxColourPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxColour,_args,_kwargs) + self.this = gdic.new_wxColour(*_args,**_kwargs) self.thisown = 1 @@ -345,17 +383,24 @@ class wxColourDatabasePtr(wxObjectPtr): self.this = this self.thisown = 0 def FindColour(self, *_args, **_kwargs): - val = apply(gdic.wxColourDatabase_FindColour,(self,) + _args, _kwargs) + val = gdic.wxColourDatabase_FindColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) + return val + def FindColourNoAdd(self, *_args, **_kwargs): + val = gdic.wxColourDatabase_FindColourNoAdd(self, *_args, **_kwargs) if val: val = wxColourPtr(val) return val def FindName(self, *_args, **_kwargs): - val = apply(gdic.wxColourDatabase_FindName,(self,) + _args, _kwargs) + val = gdic.wxColourDatabase_FindName(self, *_args, **_kwargs) + return val + def AddColour(self, *_args, **_kwargs): + val = gdic.wxColourDatabase_AddColour(self, *_args, **_kwargs) return val def Append(self, *_args, **_kwargs): - val = apply(gdic.wxColourDatabase_Append,(self,) + _args, _kwargs) + val = gdic.wxColourDatabase_Append(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxColourDatabase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxColourDatabase(wxColourDatabasePtr): def __init__(self,this): self.this = this @@ -374,57 +419,58 @@ class wxPenPtr(wxGDIObjectPtr): except: pass def GetCap(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs) + val = gdic.wxPen_GetCap(self, *_args, **_kwargs) return val def GetColour(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetColour,(self,) + _args, _kwargs) + val = gdic.wxPen_GetColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetJoin(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetJoin,(self,) + _args, _kwargs) + val = gdic.wxPen_GetJoin(self, *_args, **_kwargs) return val def GetStyle(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetStyle,(self,) + _args, _kwargs) + val = gdic.wxPen_GetStyle(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetWidth,(self,) + _args, _kwargs) + val = gdic.wxPen_GetWidth(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxPen_Ok,(self,) + _args, _kwargs) + val = gdic.wxPen_Ok(self, *_args, **_kwargs) return val def SetCap(self, *_args, **_kwargs): - val = apply(gdic.wxPen_SetCap,(self,) + _args, _kwargs) + val = gdic.wxPen_SetCap(self, *_args, **_kwargs) return val def SetColour(self, *_args, **_kwargs): - val = apply(gdic.wxPen_SetColour,(self,) + _args, _kwargs) + val = gdic.wxPen_SetColour(self, *_args, **_kwargs) return val def SetJoin(self, *_args, **_kwargs): - val = apply(gdic.wxPen_SetJoin,(self,) + _args, _kwargs) + val = gdic.wxPen_SetJoin(self, *_args, **_kwargs) return val def SetStyle(self, *_args, **_kwargs): - val = apply(gdic.wxPen_SetStyle,(self,) + _args, _kwargs) + val = gdic.wxPen_SetStyle(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs) + val = gdic.wxPen_SetWidth(self, *_args, **_kwargs) return val def SetDashes(self, *_args, **_kwargs): - val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs) + val = gdic.wxPen_SetDashes(self, *_args, **_kwargs) return val def GetDashes(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs) + val = gdic.wxPen_GetDashes(self, *_args, **_kwargs) return val def GetStipple(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetStipple,(self,) + _args, _kwargs) + val = gdic.wxPen_GetStipple(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) return val def SetStipple(self, *_args, **_kwargs): - val = apply(gdic.wxPen_SetStipple,(self,) + _args, _kwargs) + val = gdic.wxPen_SetStipple(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxPen(wxPenPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxPen,_args,_kwargs) + self.this = gdic.new_wxPen(*_args,**_kwargs) self.thisown = 1 @@ -441,13 +487,13 @@ class wxPyPenPtr(wxPenPtr): except: pass def SetDashes(self, *_args, **_kwargs): - val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs) + val = gdic.wxPyPen_SetDashes(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyPen(wxPyPenPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxPyPen,_args,_kwargs) + self.this = gdic.new_wxPyPen(*_args,**_kwargs) self.thisown = 1 @@ -458,20 +504,20 @@ class wxPenListPtr(wxObjectPtr): self.this = this self.thisown = 0 def AddPen(self, *_args, **_kwargs): - val = apply(gdic.wxPenList_AddPen,(self,) + _args, _kwargs) + val = gdic.wxPenList_AddPen(self, *_args, **_kwargs) return val def FindOrCreatePen(self, *_args, **_kwargs): - val = apply(gdic.wxPenList_FindOrCreatePen,(self,) + _args, _kwargs) + val = gdic.wxPenList_FindOrCreatePen(self, *_args, **_kwargs) if val: val = wxPenPtr(val) return val def RemovePen(self, *_args, **_kwargs): - val = apply(gdic.wxPenList_RemovePen,(self,) + _args, _kwargs) + val = gdic.wxPenList_RemovePen(self, *_args, **_kwargs) return val def GetCount(self, *_args, **_kwargs): - val = apply(gdic.wxPenList_GetCount,(self,) + _args, _kwargs) + val = gdic.wxPenList_GetCount(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPenList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPenList(wxPenListPtr): def __init__(self,this): self.this = this @@ -490,33 +536,34 @@ class wxBrushPtr(wxGDIObjectPtr): except: pass def GetColour(self, *_args, **_kwargs): - val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs) + val = gdic.wxBrush_GetColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetStipple(self, *_args, **_kwargs): - val = apply(gdic.wxBrush_GetStipple,(self,) + _args, _kwargs) + val = gdic.wxBrush_GetStipple(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) return val def GetStyle(self, *_args, **_kwargs): - val = apply(gdic.wxBrush_GetStyle,(self,) + _args, _kwargs) + val = gdic.wxBrush_GetStyle(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxBrush_Ok,(self,) + _args, _kwargs) + val = gdic.wxBrush_Ok(self, *_args, **_kwargs) return val def SetColour(self, *_args, **_kwargs): - val = apply(gdic.wxBrush_SetColour,(self,) + _args, _kwargs) + val = gdic.wxBrush_SetColour(self, *_args, **_kwargs) return val def SetStipple(self, *_args, **_kwargs): - val = apply(gdic.wxBrush_SetStipple,(self,) + _args, _kwargs) + val = gdic.wxBrush_SetStipple(self, *_args, **_kwargs) return val def SetStyle(self, *_args, **_kwargs): - val = apply(gdic.wxBrush_SetStyle,(self,) + _args, _kwargs) + val = gdic.wxBrush_SetStyle(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxBrush(wxBrushPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxBrush,_args,_kwargs) + self.this = gdic.new_wxBrush(*_args,**_kwargs) self.thisown = 1 @@ -527,20 +574,20 @@ class wxBrushListPtr(wxObjectPtr): self.this = this self.thisown = 0 def AddBrush(self, *_args, **_kwargs): - val = apply(gdic.wxBrushList_AddBrush,(self,) + _args, _kwargs) + val = gdic.wxBrushList_AddBrush(self, *_args, **_kwargs) return val def FindOrCreateBrush(self, *_args, **_kwargs): - val = apply(gdic.wxBrushList_FindOrCreateBrush,(self,) + _args, _kwargs) + val = gdic.wxBrushList_FindOrCreateBrush(self, *_args, **_kwargs) if val: val = wxBrushPtr(val) return val def RemoveBrush(self, *_args, **_kwargs): - val = apply(gdic.wxBrushList_RemoveBrush,(self,) + _args, _kwargs) + val = gdic.wxBrushList_RemoveBrush(self, *_args, **_kwargs) return val def GetCount(self, *_args, **_kwargs): - val = apply(gdic.wxBrushList_GetCount,(self,) + _args, _kwargs) + val = gdic.wxBrushList_GetCount(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBrushList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBrushList(wxBrushListPtr): def __init__(self,this): self.this = this @@ -559,312 +606,313 @@ class wxDCPtr(wxObjectPtr): except: pass def BeginDrawing(self, *_args, **_kwargs): - val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs) + val = gdic.wxDC_BeginDrawing(self, *_args, **_kwargs) return val def Blit(self, *_args, **_kwargs): - val = apply(gdic.wxDC_Blit,(self,) + _args, _kwargs) + val = gdic.wxDC_Blit(self, *_args, **_kwargs) return val def Clear(self, *_args, **_kwargs): - val = apply(gdic.wxDC_Clear,(self,) + _args, _kwargs) + val = gdic.wxDC_Clear(self, *_args, **_kwargs) return val def CrossHair(self, *_args, **_kwargs): - val = apply(gdic.wxDC_CrossHair,(self,) + _args, _kwargs) + val = gdic.wxDC_CrossHair(self, *_args, **_kwargs) return val def DestroyClippingRegion(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DestroyClippingRegion,(self,) + _args, _kwargs) + val = gdic.wxDC_DestroyClippingRegion(self, *_args, **_kwargs) return val def DeviceToLogicalX(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DeviceToLogicalX,(self,) + _args, _kwargs) + val = gdic.wxDC_DeviceToLogicalX(self, *_args, **_kwargs) return val def DeviceToLogicalXRel(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DeviceToLogicalXRel,(self,) + _args, _kwargs) + val = gdic.wxDC_DeviceToLogicalXRel(self, *_args, **_kwargs) return val def DeviceToLogicalY(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DeviceToLogicalY,(self,) + _args, _kwargs) + val = gdic.wxDC_DeviceToLogicalY(self, *_args, **_kwargs) return val def DeviceToLogicalYRel(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DeviceToLogicalYRel,(self,) + _args, _kwargs) + val = gdic.wxDC_DeviceToLogicalYRel(self, *_args, **_kwargs) return val def DrawArc(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawArc,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawArc(self, *_args, **_kwargs) return val def DrawCircle(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawCircle,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawCircle(self, *_args, **_kwargs) return val def DrawEllipse(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawEllipse,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawEllipse(self, *_args, **_kwargs) return val def DrawEllipticArc(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawEllipticArc,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawEllipticArc(self, *_args, **_kwargs) return val def DrawIcon(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawIcon(self, *_args, **_kwargs) return val def DrawLabel(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawLabel,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawLabel(self, *_args, **_kwargs) return val def DrawImageLabel(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawImageLabel,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawImageLabel(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def DrawLine(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawLine(self, *_args, **_kwargs) return val def DrawLines(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawLines,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawLines(self, *_args, **_kwargs) return val def DrawPolygon(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawPolygon,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawPolygon(self, *_args, **_kwargs) return val def DrawPoint(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawPoint,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawPoint(self, *_args, **_kwargs) return val def DrawRectangle(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawRectangle,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawRectangle(self, *_args, **_kwargs) return val def DrawRectangleRect(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawRectangleRect,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawRectangleRect(self, *_args, **_kwargs) return val def DrawRotatedText(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawRotatedText,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawRotatedText(self, *_args, **_kwargs) return val def DrawRoundedRectangle(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawRoundedRectangle,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawRoundedRectangle(self, *_args, **_kwargs) return val def DrawSpline(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawSpline,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawSpline(self, *_args, **_kwargs) return val def DrawText(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawText,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawText(self, *_args, **_kwargs) return val def EndDoc(self, *_args, **_kwargs): - val = apply(gdic.wxDC_EndDoc,(self,) + _args, _kwargs) + val = gdic.wxDC_EndDoc(self, *_args, **_kwargs) return val def EndDrawing(self, *_args, **_kwargs): - val = apply(gdic.wxDC_EndDrawing,(self,) + _args, _kwargs) + val = gdic.wxDC_EndDrawing(self, *_args, **_kwargs) return val def EndPage(self, *_args, **_kwargs): - val = apply(gdic.wxDC_EndPage,(self,) + _args, _kwargs) + val = gdic.wxDC_EndPage(self, *_args, **_kwargs) return val def FloodFill(self, *_args, **_kwargs): - val = apply(gdic.wxDC_FloodFill,(self,) + _args, _kwargs) + val = gdic.wxDC_FloodFill(self, *_args, **_kwargs) return val def GetBackground(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetBackground,(self,) + _args, _kwargs) + val = gdic.wxDC_GetBackground(self, *_args, **_kwargs) if val: val = wxBrushPtr(val) ; val.thisown = 1 return val def GetBrush(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetBrush,(self,) + _args, _kwargs) + val = gdic.wxDC_GetBrush(self, *_args, **_kwargs) if val: val = wxBrushPtr(val) ; val.thisown = 1 return val def GetCharHeight(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetCharHeight,(self,) + _args, _kwargs) + val = gdic.wxDC_GetCharHeight(self, *_args, **_kwargs) return val def GetCharWidth(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetCharWidth,(self,) + _args, _kwargs) + val = gdic.wxDC_GetCharWidth(self, *_args, **_kwargs) return val def GetClippingBox(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetClippingBox,(self,) + _args, _kwargs) + val = gdic.wxDC_GetClippingBox(self, *_args, **_kwargs) return val def GetFont(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetFont,(self,) + _args, _kwargs) + val = gdic.wxDC_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetLogicalFunction(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs) + val = gdic.wxDC_GetLogicalFunction(self, *_args, **_kwargs) return val def GetLogicalScale(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetLogicalScale,(self,) + _args, _kwargs) + val = gdic.wxDC_GetLogicalScale(self, *_args, **_kwargs) return val def GetMapMode(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetMapMode,(self,) + _args, _kwargs) + val = gdic.wxDC_GetMapMode(self, *_args, **_kwargs) return val def GetOptimization(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetOptimization,(self,) + _args, _kwargs) + val = gdic.wxDC_GetOptimization(self, *_args, **_kwargs) return val def GetPen(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetPen,(self,) + _args, _kwargs) + val = gdic.wxDC_GetPen(self, *_args, **_kwargs) if val: val = wxPenPtr(val) ; val.thisown = 1 return val def GetPixel(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetPixel,(self,) + _args, _kwargs) + val = gdic.wxDC_GetPixel(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetSizeTuple(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetSizeTuple,(self,) + _args, _kwargs) + val = gdic.wxDC_GetSizeTuple(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetSize,(self,) + _args, _kwargs) + val = gdic.wxDC_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetSizeMM(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetSizeMM,(self,) + _args, _kwargs) + val = gdic.wxDC_GetSizeMM(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetTextBackground(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs) + val = gdic.wxDC_GetTextBackground(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetTextExtent(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetTextExtent,(self,) + _args, _kwargs) + val = gdic.wxDC_GetTextExtent(self, *_args, **_kwargs) return val def GetFullTextExtent(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetFullTextExtent,(self,) + _args, _kwargs) + val = gdic.wxDC_GetFullTextExtent(self, *_args, **_kwargs) return val def GetMultiLineTextExtent(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetMultiLineTextExtent,(self,) + _args, _kwargs) + val = gdic.wxDC_GetMultiLineTextExtent(self, *_args, **_kwargs) return val def GetTextForeground(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs) + val = gdic.wxDC_GetTextForeground(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetUserScale(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetUserScale,(self,) + _args, _kwargs) + val = gdic.wxDC_GetUserScale(self, *_args, **_kwargs) return val def LogicalToDeviceX(self, *_args, **_kwargs): - val = apply(gdic.wxDC_LogicalToDeviceX,(self,) + _args, _kwargs) + val = gdic.wxDC_LogicalToDeviceX(self, *_args, **_kwargs) return val def LogicalToDeviceXRel(self, *_args, **_kwargs): - val = apply(gdic.wxDC_LogicalToDeviceXRel,(self,) + _args, _kwargs) + val = gdic.wxDC_LogicalToDeviceXRel(self, *_args, **_kwargs) return val def LogicalToDeviceY(self, *_args, **_kwargs): - val = apply(gdic.wxDC_LogicalToDeviceY,(self,) + _args, _kwargs) + val = gdic.wxDC_LogicalToDeviceY(self, *_args, **_kwargs) return val def LogicalToDeviceYRel(self, *_args, **_kwargs): - val = apply(gdic.wxDC_LogicalToDeviceYRel,(self,) + _args, _kwargs) + val = gdic.wxDC_LogicalToDeviceYRel(self, *_args, **_kwargs) return val def MaxX(self, *_args, **_kwargs): - val = apply(gdic.wxDC_MaxX,(self,) + _args, _kwargs) + val = gdic.wxDC_MaxX(self, *_args, **_kwargs) return val def MaxY(self, *_args, **_kwargs): - val = apply(gdic.wxDC_MaxY,(self,) + _args, _kwargs) + val = gdic.wxDC_MaxY(self, *_args, **_kwargs) return val def MinX(self, *_args, **_kwargs): - val = apply(gdic.wxDC_MinX,(self,) + _args, _kwargs) + val = gdic.wxDC_MinX(self, *_args, **_kwargs) return val def MinY(self, *_args, **_kwargs): - val = apply(gdic.wxDC_MinY,(self,) + _args, _kwargs) + val = gdic.wxDC_MinY(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxDC_Ok,(self,) + _args, _kwargs) + val = gdic.wxDC_Ok(self, *_args, **_kwargs) return val def SetDeviceOrigin(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetDeviceOrigin,(self,) + _args, _kwargs) + val = gdic.wxDC_SetDeviceOrigin(self, *_args, **_kwargs) return val def SetBackground(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetBackground,(self,) + _args, _kwargs) + val = gdic.wxDC_SetBackground(self, *_args, **_kwargs) return val def SetBackgroundMode(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetBackgroundMode,(self,) + _args, _kwargs) + val = gdic.wxDC_SetBackgroundMode(self, *_args, **_kwargs) return val def SetClippingRegion(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetClippingRegion,(self,) + _args, _kwargs) + val = gdic.wxDC_SetClippingRegion(self, *_args, **_kwargs) return val def SetClippingRegionAsRegion(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetClippingRegionAsRegion,(self,) + _args, _kwargs) + val = gdic.wxDC_SetClippingRegionAsRegion(self, *_args, **_kwargs) return val def SetClippingRect(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetClippingRect,(self,) + _args, _kwargs) + val = gdic.wxDC_SetClippingRect(self, *_args, **_kwargs) return val def SetPalette(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetPalette,(self,) + _args, _kwargs) + val = gdic.wxDC_SetPalette(self, *_args, **_kwargs) return val def SetBrush(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetBrush,(self,) + _args, _kwargs) + val = gdic.wxDC_SetBrush(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetFont,(self,) + _args, _kwargs) + val = gdic.wxDC_SetFont(self, *_args, **_kwargs) return val def SetLogicalFunction(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetLogicalFunction,(self,) + _args, _kwargs) + val = gdic.wxDC_SetLogicalFunction(self, *_args, **_kwargs) return val def SetLogicalScale(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetLogicalScale,(self,) + _args, _kwargs) + val = gdic.wxDC_SetLogicalScale(self, *_args, **_kwargs) return val def SetMapMode(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetMapMode,(self,) + _args, _kwargs) + val = gdic.wxDC_SetMapMode(self, *_args, **_kwargs) return val def SetOptimization(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetOptimization,(self,) + _args, _kwargs) + val = gdic.wxDC_SetOptimization(self, *_args, **_kwargs) return val def SetPen(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetPen,(self,) + _args, _kwargs) + val = gdic.wxDC_SetPen(self, *_args, **_kwargs) return val def SetTextBackground(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetTextBackground,(self,) + _args, _kwargs) + val = gdic.wxDC_SetTextBackground(self, *_args, **_kwargs) return val def SetTextForeground(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetTextForeground,(self,) + _args, _kwargs) + val = gdic.wxDC_SetTextForeground(self, *_args, **_kwargs) return val def SetUserScale(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetUserScale,(self,) + _args, _kwargs) + val = gdic.wxDC_SetUserScale(self, *_args, **_kwargs) return val def StartDoc(self, *_args, **_kwargs): - val = apply(gdic.wxDC_StartDoc,(self,) + _args, _kwargs) + val = gdic.wxDC_StartDoc(self, *_args, **_kwargs) return val def StartPage(self, *_args, **_kwargs): - val = apply(gdic.wxDC_StartPage,(self,) + _args, _kwargs) + val = gdic.wxDC_StartPage(self, *_args, **_kwargs) return val def DrawBitmap(self, *_args, **_kwargs): - val = apply(gdic.wxDC_DrawBitmap,(self,) + _args, _kwargs) + val = gdic.wxDC_DrawBitmap(self, *_args, **_kwargs) return val def CanDrawBitmap(self, *_args, **_kwargs): - val = apply(gdic.wxDC_CanDrawBitmap,(self,) + _args, _kwargs) + val = gdic.wxDC_CanDrawBitmap(self, *_args, **_kwargs) return val def CanGetTextExtent(self, *_args, **_kwargs): - val = apply(gdic.wxDC_CanGetTextExtent,(self,) + _args, _kwargs) + val = gdic.wxDC_CanGetTextExtent(self, *_args, **_kwargs) return val def GetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetDepth,(self,) + _args, _kwargs) + val = gdic.wxDC_GetDepth(self, *_args, **_kwargs) return val def GetPPI(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetPPI,(self,) + _args, _kwargs) + val = gdic.wxDC_GetPPI(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetLogicalOrigin(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetLogicalOrigin,(self,) + _args, _kwargs) + val = gdic.wxDC_GetLogicalOrigin(self, *_args, **_kwargs) return val def SetLogicalOrigin(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetLogicalOrigin,(self,) + _args, _kwargs) + val = gdic.wxDC_SetLogicalOrigin(self, *_args, **_kwargs) return val def GetDeviceOrigin(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetDeviceOrigin,(self,) + _args, _kwargs) + val = gdic.wxDC_GetDeviceOrigin(self, *_args, **_kwargs) return val def SetAxisOrientation(self, *_args, **_kwargs): - val = apply(gdic.wxDC_SetAxisOrientation,(self,) + _args, _kwargs) + val = gdic.wxDC_SetAxisOrientation(self, *_args, **_kwargs) return val def CalcBoundingBox(self, *_args, **_kwargs): - val = apply(gdic.wxDC_CalcBoundingBox,(self,) + _args, _kwargs) + val = gdic.wxDC_CalcBoundingBox(self, *_args, **_kwargs) return val def ResetBoundingBox(self, *_args, **_kwargs): - val = apply(gdic.wxDC_ResetBoundingBox,(self,) + _args, _kwargs) + val = gdic.wxDC_ResetBoundingBox(self, *_args, **_kwargs) return val def GetBoundingBox(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetBoundingBox,(self,) + _args, _kwargs) + val = gdic.wxDC_GetBoundingBox(self, *_args, **_kwargs) return val def GetHDC(self, *_args, **_kwargs): - val = apply(gdic.wxDC_GetHDC,(self,) + _args, _kwargs) + val = gdic.wxDC_GetHDC(self, *_args, **_kwargs) return val def _DrawPointList(self, *_args, **_kwargs): - val = apply(gdic.wxDC__DrawPointList,(self,) + _args, _kwargs) + val = gdic.wxDC__DrawPointList(self, *_args, **_kwargs) return val def _DrawLineList(self, *_args, **_kwargs): - val = apply(gdic.wxDC__DrawLineList,(self,) + _args, _kwargs) + val = gdic.wxDC__DrawLineList(self, *_args, **_kwargs) return val def _DrawRectangleList(self, *_args, **_kwargs): - val = apply(gdic.wxDC__DrawRectangleList,(self,) + _args, _kwargs) + val = gdic.wxDC__DrawRectangleList(self, *_args, **_kwargs) return val def _DrawEllipseList(self, *_args, **_kwargs): - val = apply(gdic.wxDC__DrawEllipseList,(self,) + _args, _kwargs) + val = gdic.wxDC__DrawEllipseList(self, *_args, **_kwargs) return val def _DrawPolygonList(self, *_args, **_kwargs): - val = apply(gdic.wxDC__DrawPolygonList,(self,) + _args, _kwargs) + val = gdic.wxDC__DrawPolygonList(self, *_args, **_kwargs) return val def _DrawTextList(self, *_args, **_kwargs): - val = apply(gdic.wxDC__DrawTextList,(self,) + _args, _kwargs) + val = gdic.wxDC__DrawTextList(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() def DrawPointList(self, points, pens=None): if pens is None: @@ -973,13 +1021,13 @@ class wxMemoryDCPtr(wxDCPtr): self.this = this self.thisown = 0 def SelectObject(self, *_args, **_kwargs): - val = apply(gdic.wxMemoryDC_SelectObject,(self,) + _args, _kwargs) + val = gdic.wxMemoryDC_SelectObject(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMemoryDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMemoryDC(wxMemoryDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxMemoryDC,_args,_kwargs) + self.this = gdic.new_wxMemoryDC(*_args,**_kwargs) self.thisown = 1 @@ -990,20 +1038,20 @@ class wxBufferedDCPtr(wxMemoryDCPtr): self.this = this self.thisown = 0 def UnMask(self, *_args, **_kwargs): - val = apply(gdic.wxBufferedDC_UnMask,(self,) + _args, _kwargs) + val = gdic.wxBufferedDC_UnMask(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBufferedDC(wxBufferedDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxBufferedDC,_args,_kwargs) + self.this = gdic.new_wxBufferedDC(*_args,**_kwargs) self.thisown = 1 self._dc = _args[0] # save a ref so the other dc won't be deleted before self def wxBufferedDCInternalBuffer(*_args,**_kwargs): - val = wxBufferedDCPtr(apply(gdic.new_wxBufferedDCInternalBuffer,_args,_kwargs)) + val = wxBufferedDCPtr(gdic.new_wxBufferedDCInternalBuffer(*_args,**_kwargs)) val.thisown = 1 val._dc = _args[0] # save a ref so the other dc won't be deleted before self return val @@ -1014,10 +1062,10 @@ class wxBufferedPaintDCPtr(wxBufferedDCPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBufferedPaintDC(wxBufferedPaintDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxBufferedPaintDC,_args,_kwargs) + self.this = gdic.new_wxBufferedPaintDC(*_args,**_kwargs) self.thisown = 1 @@ -1028,19 +1076,19 @@ class wxScreenDCPtr(wxDCPtr): self.this = this self.thisown = 0 def StartDrawingOnTopWin(self, *_args, **_kwargs): - val = apply(gdic.wxScreenDC_StartDrawingOnTopWin,(self,) + _args, _kwargs) + val = gdic.wxScreenDC_StartDrawingOnTopWin(self, *_args, **_kwargs) return val def StartDrawingOnTop(self, *_args, **_kwargs): - val = apply(gdic.wxScreenDC_StartDrawingOnTop,(self,) + _args, _kwargs) + val = gdic.wxScreenDC_StartDrawingOnTop(self, *_args, **_kwargs) return val def EndDrawingOnTop(self, *_args, **_kwargs): - val = apply(gdic.wxScreenDC_EndDrawingOnTop,(self,) + _args, _kwargs) + val = gdic.wxScreenDC_EndDrawingOnTop(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxScreenDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxScreenDC(wxScreenDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxScreenDC,_args,_kwargs) + self.this = gdic.new_wxScreenDC(*_args,**_kwargs) self.thisown = 1 @@ -1051,10 +1099,10 @@ class wxClientDCPtr(wxDCPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxClientDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxClientDC(wxClientDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxClientDC,_args,_kwargs) + self.this = gdic.new_wxClientDC(*_args,**_kwargs) self.thisown = 1 @@ -1065,10 +1113,10 @@ class wxPaintDCPtr(wxDCPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPaintDC(wxPaintDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxPaintDC,_args,_kwargs) + self.this = gdic.new_wxPaintDC(*_args,**_kwargs) self.thisown = 1 @@ -1079,10 +1127,24 @@ class wxWindowDCPtr(wxDCPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWindowDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWindowDC(wxWindowDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxWindowDC,_args,_kwargs) + self.this = gdic.new_wxWindowDC(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxMirrorDCPtr(wxDCPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxMirrorDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxMirrorDC(wxMirrorDCPtr): + def __init__(self,*_args,**_kwargs): + self.this = gdic.new_wxMirrorDC(*_args,**_kwargs) self.thisown = 1 @@ -1099,29 +1161,30 @@ class wxMetaFilePtr(wxObjectPtr): except: pass def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxMetaFile_Ok,(self,) + _args, _kwargs) + val = gdic.wxMetaFile_Ok(self, *_args, **_kwargs) return val def SetClipboard(self, *_args, **_kwargs): - val = apply(gdic.wxMetaFile_SetClipboard,(self,) + _args, _kwargs) + val = gdic.wxMetaFile_SetClipboard(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(gdic.wxMetaFile_GetSize,(self,) + _args, _kwargs) + val = gdic.wxMetaFile_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxMetaFile_GetWidth,(self,) + _args, _kwargs) + val = gdic.wxMetaFile_GetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxMetaFile_GetHeight,(self,) + _args, _kwargs) + val = gdic.wxMetaFile_GetHeight(self, *_args, **_kwargs) return val def GetFileName(self, *_args, **_kwargs): - val = apply(gdic.wxMetaFile_GetFileName,(self,) + _args, _kwargs) + val = gdic.wxMetaFile_GetFileName(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxMetaFile(wxMetaFilePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxMetaFile,_args,_kwargs) + self.this = gdic.new_wxMetaFile(*_args,**_kwargs) self.thisown = 1 @@ -1132,14 +1195,14 @@ class wxMetaFileDCPtr(wxDCPtr): self.this = this self.thisown = 0 def Close(self, *_args, **_kwargs): - val = apply(gdic.wxMetaFileDC_Close,(self,) + _args, _kwargs) + val = gdic.wxMetaFileDC_Close(self, *_args, **_kwargs) if val: val = wxMetaFilePtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMetaFileDC(wxMetaFileDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxMetaFileDC,_args,_kwargs) + self.this = gdic.new_wxMetaFileDC(*_args,**_kwargs) self.thisown = 1 @@ -1156,19 +1219,20 @@ class wxPalettePtr(wxGDIObjectPtr): except: pass def GetPixel(self, *_args, **_kwargs): - val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs) + val = gdic.wxPalette_GetPixel(self, *_args, **_kwargs) return val def GetRGB(self, *_args, **_kwargs): - val = apply(gdic.wxPalette_GetRGB,(self,) + _args, _kwargs) + val = gdic.wxPalette_GetRGB(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxPalette_Ok,(self,) + _args, _kwargs) + val = gdic.wxPalette_Ok(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxPalette(wxPalettePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxPalette,_args,_kwargs) + self.this = gdic.new_wxPalette(*_args,**_kwargs) self.thisown = 1 @@ -1185,37 +1249,37 @@ class wxImageListPtr(wxObjectPtr): except: pass def Add(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs) + val = gdic.wxImageList_Add(self, *_args, **_kwargs) return val def AddWithColourMask(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_AddWithColourMask,(self,) + _args, _kwargs) + val = gdic.wxImageList_AddWithColourMask(self, *_args, **_kwargs) return val def AddIcon(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_AddIcon,(self,) + _args, _kwargs) + val = gdic.wxImageList_AddIcon(self, *_args, **_kwargs) return val def Replace(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_Replace,(self,) + _args, _kwargs) + val = gdic.wxImageList_Replace(self, *_args, **_kwargs) return val def Draw(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_Draw,(self,) + _args, _kwargs) + val = gdic.wxImageList_Draw(self, *_args, **_kwargs) return val def GetImageCount(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_GetImageCount,(self,) + _args, _kwargs) + val = gdic.wxImageList_GetImageCount(self, *_args, **_kwargs) return val def Remove(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_Remove,(self,) + _args, _kwargs) + val = gdic.wxImageList_Remove(self, *_args, **_kwargs) return val def RemoveAll(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_RemoveAll,(self,) + _args, _kwargs) + val = gdic.wxImageList_RemoveAll(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(gdic.wxImageList_GetSize,(self,) + _args, _kwargs) + val = gdic.wxImageList_GetSize(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxImageList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxImageList(wxImageListPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxImageList,_args,_kwargs) + self.this = gdic.new_wxImageList(*_args,**_kwargs) self.thisown = 1 @@ -1232,77 +1296,89 @@ class wxRegionPtr(wxGDIObjectPtr): except: pass def Clear(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs) + val = gdic.wxRegion_Clear(self, *_args, **_kwargs) return val def Offset(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_Offset,(self,) + _args, _kwargs) + val = gdic.wxRegion_Offset(self, *_args, **_kwargs) return val def Contains(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs) + val = gdic.wxRegion_Contains(self, *_args, **_kwargs) return val def ContainsPoint(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_ContainsPoint,(self,) + _args, _kwargs) + val = gdic.wxRegion_ContainsPoint(self, *_args, **_kwargs) return val def ContainsRect(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_ContainsRect,(self,) + _args, _kwargs) + val = gdic.wxRegion_ContainsRect(self, *_args, **_kwargs) return val def ContainsRectDim(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_ContainsRectDim,(self,) + _args, _kwargs) + val = gdic.wxRegion_ContainsRectDim(self, *_args, **_kwargs) return val def GetBox(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_GetBox,(self,) + _args, _kwargs) + val = gdic.wxRegion_GetBox(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def Intersect(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_Intersect,(self,) + _args, _kwargs) + val = gdic.wxRegion_Intersect(self, *_args, **_kwargs) return val def IntersectRect(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_IntersectRect,(self,) + _args, _kwargs) + val = gdic.wxRegion_IntersectRect(self, *_args, **_kwargs) return val def IntersectRegion(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_IntersectRegion,(self,) + _args, _kwargs) + val = gdic.wxRegion_IntersectRegion(self, *_args, **_kwargs) return val def IsEmpty(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_IsEmpty,(self,) + _args, _kwargs) + val = gdic.wxRegion_IsEmpty(self, *_args, **_kwargs) return val def Union(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_Union,(self,) + _args, _kwargs) + val = gdic.wxRegion_Union(self, *_args, **_kwargs) return val def UnionRect(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_UnionRect,(self,) + _args, _kwargs) + val = gdic.wxRegion_UnionRect(self, *_args, **_kwargs) return val def UnionRegion(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_UnionRegion,(self,) + _args, _kwargs) + val = gdic.wxRegion_UnionRegion(self, *_args, **_kwargs) return val def Subtract(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_Subtract,(self,) + _args, _kwargs) + val = gdic.wxRegion_Subtract(self, *_args, **_kwargs) return val def SubtractRect(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_SubtractRect,(self,) + _args, _kwargs) + val = gdic.wxRegion_SubtractRect(self, *_args, **_kwargs) return val def SubtractRegion(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_SubtractRegion,(self,) + _args, _kwargs) + val = gdic.wxRegion_SubtractRegion(self, *_args, **_kwargs) return val def Xor(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_Xor,(self,) + _args, _kwargs) + val = gdic.wxRegion_Xor(self, *_args, **_kwargs) return val def XorRect(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_XorRect,(self,) + _args, _kwargs) + val = gdic.wxRegion_XorRect(self, *_args, **_kwargs) return val def XorRegion(self, *_args, **_kwargs): - val = apply(gdic.wxRegion_XorRegion,(self,) + _args, _kwargs) + val = gdic.wxRegion_XorRegion(self, *_args, **_kwargs) + return val + def ConvertToBitmap(self, *_args, **_kwargs): + val = gdic.wxRegion_ConvertToBitmap(self, *_args, **_kwargs) + if val: val = wxBitmapPtr(val) ; val.thisown = 1 + return val + def UnionBitmap(self, *_args, **_kwargs): + val = gdic.wxRegion_UnionBitmap(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxRegion(wxRegionPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxRegion,_args,_kwargs) + self.this = gdic.new_wxRegion(*_args,**_kwargs) self.thisown = 1 def wxRegionFromPoints(*_args,**_kwargs): - val = wxRegionPtr(apply(gdic.new_wxRegionFromPoints,_args,_kwargs)) + val = wxRegionPtr(gdic.new_wxRegionFromPoints(*_args,**_kwargs)) + val.thisown = 1 + return val + +def wxRegionFromBitmap(*_args,**_kwargs): + val = wxRegionPtr(gdic.new_wxRegionFromBitmap(*_args,**_kwargs)) val.thisown = 1 return val @@ -1318,41 +1394,41 @@ class wxRegionIteratorPtr(wxObjectPtr): except: pass def GetX(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_GetX(self, *_args, **_kwargs) return val def GetY(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_GetY,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_GetY(self, *_args, **_kwargs) return val def GetW(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_GetW,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_GetW(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_GetWidth,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_GetWidth(self, *_args, **_kwargs) return val def GetH(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_GetH,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_GetH(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_GetHeight,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_GetHeight(self, *_args, **_kwargs) return val def GetRect(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_GetRect,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_GetRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def HaveRects(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_HaveRects,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_HaveRects(self, *_args, **_kwargs) return val def Reset(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_Reset,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_Reset(self, *_args, **_kwargs) return val def Next(self, *_args, **_kwargs): - val = apply(gdic.wxRegionIterator_Next,(self,) + _args, _kwargs) + val = gdic.wxRegionIterator_Next(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxRegionIterator(wxRegionIteratorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxRegionIterator,_args,_kwargs) + self.this = gdic.new_wxRegionIterator(*_args,**_kwargs) self.thisown = 1 @@ -1363,62 +1439,72 @@ class wxRegionIterator(wxRegionIteratorPtr): #-------------- FUNCTION WRAPPERS ------------------ def wxEmptyBitmap(*_args, **_kwargs): - val = apply(gdic.wxEmptyBitmap,_args,_kwargs) + val = gdic.wxEmptyBitmap(*_args,**_kwargs) if val: val = wxBitmapPtr(val); val.thisown = 1 return val def wxBitmapFromXPMData(*_args, **_kwargs): - val = apply(gdic.wxBitmapFromXPMData,_args,_kwargs) + val = gdic.wxBitmapFromXPMData(*_args,**_kwargs) if val: val = wxBitmapPtr(val); val.thisown = 1 return val def wxBitmapFromIcon(*_args, **_kwargs): - val = apply(gdic.wxBitmapFromIcon,_args,_kwargs) + val = gdic.wxBitmapFromIcon(*_args,**_kwargs) if val: val = wxBitmapPtr(val); val.thisown = 1 return val def wxBitmapFromBits(*_args, **_kwargs): - val = apply(gdic.wxBitmapFromBits,_args,_kwargs) + val = gdic.wxBitmapFromBits(*_args,**_kwargs) if val: val = wxBitmapPtr(val); val.thisown = 1 return val def wxMaskColour(*_args, **_kwargs): - val = apply(gdic.wxMaskColour,_args,_kwargs) + val = gdic.wxMaskColour(*_args,**_kwargs) if val: val = wxMaskPtr(val); val.thisown = 1 return val def wxEmptyIcon(*_args, **_kwargs): - val = apply(gdic.wxEmptyIcon,_args,_kwargs) + val = gdic.wxEmptyIcon(*_args,**_kwargs) if val: val = wxIconPtr(val); val.thisown = 1 return val def wxIconFromXPMData(*_args, **_kwargs): - val = apply(gdic.wxIconFromXPMData,_args,_kwargs) + val = gdic.wxIconFromXPMData(*_args,**_kwargs) if val: val = wxIconPtr(val); val.thisown = 1 return val def wxIconFromBitmap(*_args, **_kwargs): - val = apply(gdic.wxIconFromBitmap,_args,_kwargs) + val = gdic.wxIconFromBitmap(*_args,**_kwargs) + if val: val = wxIconPtr(val); val.thisown = 1 + return val + +def wxIconFromLocation(*_args, **_kwargs): + val = gdic.wxIconFromLocation(*_args,**_kwargs) if val: val = wxIconPtr(val); val.thisown = 1 return val def wxStockCursor(*_args, **_kwargs): - val = apply(gdic.wxStockCursor,_args,_kwargs) + val = gdic.wxStockCursor(*_args,**_kwargs) if val: val = wxCursorPtr(val); val.thisown = 1 return val def wxCursorFromImage(*_args, **_kwargs): - val = apply(gdic.wxCursorFromImage,_args,_kwargs) + val = gdic.wxCursorFromImage(*_args,**_kwargs) + if val: val = wxCursorPtr(val); val.thisown = 1 + return val + +def wxCursorFromBits(*_args, **_kwargs): + val = gdic.wxCursorFromBits(*_args,**_kwargs) if val: val = wxCursorPtr(val); val.thisown = 1 return val def wxNamedColour(*_args, **_kwargs): - val = apply(gdic.wxNamedColour,_args,_kwargs) + val = gdic.wxNamedColour(*_args,**_kwargs) if val: val = wxColourPtr(val); val.thisown = 1 return val def wxMemoryDCFromDC(*_args, **_kwargs): - val = apply(gdic.wxMemoryDCFromDC,_args,_kwargs) + val = gdic.wxMemoryDCFromDC(*_args,**_kwargs) if val: val = wxMemoryDCPtr(val); val.thisown = 1 return val diff --git a/wxPython/src/msw/grid.cpp b/wxPython/src/msw/grid.cpp index ceba6e77bf..c8c0575c88 100644 --- a/wxPython/src/msw/grid.cpp +++ b/wxPython/src/msw/grid.cpp @@ -3855,13 +3855,13 @@ static PyObject *_wrap_wxGridCellAttr_SetSize(PyObject *self, PyObject *args, Py static PyObject *_wrap_wxGridCellAttr_SetOverflow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxGridCellAttr * _arg0; - bool _arg1; + bool _arg1 = (bool ) TRUE; PyObject * _argo0 = 0; - int tempbool1; + int tempbool1 = (int) TRUE; char *_kwnames[] = { "self","allow", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridCellAttr_SetOverflow",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxGridCellAttr_SetOverflow",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4212,6 +4212,34 @@ static PyObject *_wrap_wxGridCellAttr_HasReadWriteMode(PyObject *self, PyObject return _resultobj; } +#define wxGridCellAttr_HasOverflowMode(_swigobj) (_swigobj->HasOverflowMode()) +static PyObject *_wrap_wxGridCellAttr_HasOverflowMode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxGridCellAttr * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellAttr_HasOverflowMode",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellAttr_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellAttr_HasOverflowMode. Expected _wxGridCellAttr_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxGridCellAttr_HasOverflowMode(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridCellAttr_GetTextColour(_swigobj) (_swigobj->GetTextColour()) static PyObject *_wrap_wxGridCellAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -4355,14 +4383,20 @@ static PyObject *_wrap_wxGridCellAttr_GetSize(PyObject *self, PyObject *args, Py PyObject * _resultobj; wxGridCellAttr * _arg0; int * _arg1; + int temp; int * _arg2; + int temp0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","num_rows","num_cols", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxGridCellAttr_GetSize",_kwnames,&_argo0,&_argo1,&_argo2)) +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellAttr_GetSize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4371,20 +4405,6 @@ static PyObject *_wrap_wxGridCellAttr_GetSize(PyObject *self, PyObject *args, Py return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCellAttr_GetSize. Expected _int_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxGridCellAttr_GetSize. Expected _int_p."); - return NULL; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGridCellAttr_GetSize(_arg0,_arg1,_arg2); @@ -4393,6 +4413,16 @@ static PyObject *_wrap_wxGridCellAttr_GetSize(PyObject *self, PyObject *args, Py if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -11341,14 +11371,20 @@ static PyObject *_wrap_wxGrid_GetDefaultCellAlignment(PyObject *self, PyObject * PyObject * _resultobj; wxGrid * _arg0; int * _arg1; + int temp; int * _arg2; + int temp0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","horiz","vert", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxGrid_GetDefaultCellAlignment",_kwnames,&_argo0,&_argo1,&_argo2)) +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetDefaultCellAlignment",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -11357,20 +11393,6 @@ static PyObject *_wrap_wxGrid_GetDefaultCellAlignment(PyObject *self, PyObject * return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGrid_GetDefaultCellAlignment. Expected _int_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxGrid_GetDefaultCellAlignment. Expected _int_p."); - return NULL; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGrid_GetDefaultCellAlignment(_arg0,_arg1,_arg2); @@ -11379,6 +11401,16 @@ static PyObject *_wrap_wxGrid_GetDefaultCellAlignment(PyObject *self, PyObject * if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -11389,14 +11421,20 @@ static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args, P int _arg1; int _arg2; int * _arg3; + int temp; int * _arg4; + int temp0; PyObject * _argo0 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; - char *_kwnames[] = { "self","row","col","horiz","vert", NULL }; + char *_kwnames[] = { "self","row","col", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiOO:wxGrid_GetCellAlignment",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4)) +{ + _arg3 = &temp; +} +{ + _arg4 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetCellAlignment",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -11405,20 +11443,6 @@ static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args, P return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxGrid_GetCellAlignment. Expected _int_p."); - return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxGrid_GetCellAlignment. Expected _int_p."); - return NULL; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGrid_GetCellAlignment(_arg0,_arg1,_arg2,_arg3,_arg4); @@ -11427,6 +11451,16 @@ static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args, P if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg3)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg4)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -11934,6 +11968,120 @@ static PyObject *_wrap_wxGrid_SetRowMinimalHeight(PyObject *self, PyObject *args return _resultobj; } +#define wxGrid_SetColMinimalAcceptableWidth(_swigobj,_swigarg0) (_swigobj->SetColMinimalAcceptableWidth(_swigarg0)) +static PyObject *_wrap_wxGrid_SetColMinimalAcceptableWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetColMinimalAcceptableWidth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetColMinimalAcceptableWidth. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGrid_SetColMinimalAcceptableWidth(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGrid_SetRowMinimalAcceptableHeight(_swigobj,_swigarg0) (_swigobj->SetRowMinimalAcceptableHeight(_swigarg0)) +static PyObject *_wrap_wxGrid_SetRowMinimalAcceptableHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetRowMinimalAcceptableHeight",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetRowMinimalAcceptableHeight. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxGrid_SetRowMinimalAcceptableHeight(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGrid_GetColMinimalAcceptableWidth(_swigobj) (_swigobj->GetColMinimalAcceptableWidth()) +static PyObject *_wrap_wxGrid_GetColMinimalAcceptableWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGrid * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetColMinimalAcceptableWidth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetColMinimalAcceptableWidth. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxGrid_GetColMinimalAcceptableWidth(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxGrid_GetRowMinimalAcceptableHeight(_swigobj) (_swigobj->GetRowMinimalAcceptableHeight()) +static PyObject *_wrap_wxGrid_GetRowMinimalAcceptableHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGrid * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetRowMinimalAcceptableHeight",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetRowMinimalAcceptableHeight. Expected _wxGrid_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxGrid_GetRowMinimalAcceptableHeight(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGrid_SetDefaultCellBackgroundColour(_swigobj,_swigarg0) (_swigobj->SetDefaultCellBackgroundColour(_swigarg0)) static PyObject *_wrap_wxGrid_SetDefaultCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -15034,6 +15182,10 @@ static PyMethodDef gridcMethods[] = { { "wxGrid_SetDefaultCellTextColour", (PyCFunction) _wrap_wxGrid_SetDefaultCellTextColour, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetCellBackgroundColour", (PyCFunction) _wrap_wxGrid_SetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetDefaultCellBackgroundColour", (PyCFunction) _wrap_wxGrid_SetDefaultCellBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_GetRowMinimalAcceptableHeight", (PyCFunction) _wrap_wxGrid_GetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_GetColMinimalAcceptableWidth", (PyCFunction) _wrap_wxGrid_GetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_SetRowMinimalAcceptableHeight", (PyCFunction) _wrap_wxGrid_SetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_SetColMinimalAcceptableWidth", (PyCFunction) _wrap_wxGrid_SetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetRowMinimalHeight", (PyCFunction) _wrap_wxGrid_SetRowMinimalHeight, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_SetColMinimalWidth", (PyCFunction) _wrap_wxGrid_SetColMinimalWidth, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_AutoSizeColLabelSize", (PyCFunction) _wrap_wxGrid_AutoSizeColLabelSize, METH_VARARGS | METH_KEYWORDS }, @@ -15267,6 +15419,7 @@ static PyMethodDef gridcMethods[] = { { "wxGridCellAttr_GetFont", (PyCFunction) _wrap_wxGridCellAttr_GetFont, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellAttr_GetBackgroundColour", (PyCFunction) _wrap_wxGridCellAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellAttr_GetTextColour", (PyCFunction) _wrap_wxGridCellAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxGridCellAttr_HasOverflowMode", (PyCFunction) _wrap_wxGridCellAttr_HasOverflowMode, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellAttr_HasReadWriteMode", (PyCFunction) _wrap_wxGridCellAttr_HasReadWriteMode, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellAttr_HasEditor", (PyCFunction) _wrap_wxGridCellAttr_HasEditor, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellAttr_HasRenderer", (PyCFunction) _wrap_wxGridCellAttr_HasRenderer, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py index 258b2736ec..54009717e2 100644 --- a/wxPython/src/msw/grid.py +++ b/wxPython/src/msw/grid.py @@ -70,29 +70,29 @@ class wxGridCellRendererPtr : self.this = this self.thisown = 0 def _setOORInfo(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellRenderer__setOORInfo,(self,) + _args, _kwargs) + val = gridc.wxGridCellRenderer__setOORInfo(self, *_args, **_kwargs) return val def SetParameters(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellRenderer_SetParameters,(self,) + _args, _kwargs) + val = gridc.wxGridCellRenderer_SetParameters(self, *_args, **_kwargs) return val def IncRef(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellRenderer_IncRef,(self,) + _args, _kwargs) + val = gridc.wxGridCellRenderer_IncRef(self, *_args, **_kwargs) return val def DecRef(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellRenderer_DecRef,(self,) + _args, _kwargs) + val = gridc.wxGridCellRenderer_DecRef(self, *_args, **_kwargs) return val def Draw(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellRenderer_Draw,(self,) + _args, _kwargs) + val = gridc.wxGridCellRenderer_Draw(self, *_args, **_kwargs) return val def GetBestSize(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellRenderer_GetBestSize,(self,) + _args, _kwargs) + val = gridc.wxGridCellRenderer_GetBestSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def Clone(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellRenderer_Clone,(self,) + _args, _kwargs) + val = gridc.wxGridCellRenderer_Clone(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellRenderer(wxGridCellRendererPtr): def __init__(self,this): self.this = this @@ -105,16 +105,16 @@ class wxPyGridCellRendererPtr(wxGridCellRendererPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellRenderer__setCallbackInfo,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellRenderer__setCallbackInfo(self, *_args, **_kwargs) return val def base_SetParameters(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellRenderer_base_SetParameters,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellRenderer_base_SetParameters(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyGridCellRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyGridCellRenderer(wxPyGridCellRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxPyGridCellRenderer,_args,_kwargs) + self.this = gridc.new_wxPyGridCellRenderer(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyGridCellRenderer) self._setOORInfo(self) @@ -127,10 +127,10 @@ class wxGridCellStringRendererPtr(wxGridCellRendererPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellStringRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellStringRenderer(wxGridCellStringRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellStringRenderer,_args,_kwargs) + self.this = gridc.new_wxGridCellStringRenderer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -142,10 +142,10 @@ class wxGridCellNumberRendererPtr(wxGridCellStringRendererPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellNumberRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellNumberRenderer(wxGridCellNumberRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellNumberRenderer,_args,_kwargs) + self.this = gridc.new_wxGridCellNumberRenderer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -157,22 +157,22 @@ class wxGridCellFloatRendererPtr(wxGridCellStringRendererPtr): self.this = this self.thisown = 0 def GetWidth(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellFloatRenderer_GetWidth,(self,) + _args, _kwargs) + val = gridc.wxGridCellFloatRenderer_GetWidth(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellFloatRenderer_SetWidth,(self,) + _args, _kwargs) + val = gridc.wxGridCellFloatRenderer_SetWidth(self, *_args, **_kwargs) return val def GetPrecision(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellFloatRenderer_GetPrecision,(self,) + _args, _kwargs) + val = gridc.wxGridCellFloatRenderer_GetPrecision(self, *_args, **_kwargs) return val def SetPrecision(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellFloatRenderer_SetPrecision,(self,) + _args, _kwargs) + val = gridc.wxGridCellFloatRenderer_SetPrecision(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellFloatRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellFloatRenderer(wxGridCellFloatRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellFloatRenderer,_args,_kwargs) + self.this = gridc.new_wxGridCellFloatRenderer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -184,10 +184,10 @@ class wxGridCellBoolRendererPtr(wxGridCellRendererPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellBoolRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellBoolRenderer(wxGridCellBoolRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellBoolRenderer,_args,_kwargs) + self.this = gridc.new_wxGridCellBoolRenderer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -199,10 +199,10 @@ class wxGridCellDateTimeRendererPtr(wxGridCellStringRendererPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellDateTimeRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellDateTimeRenderer(wxGridCellDateTimeRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellDateTimeRenderer,_args,_kwargs) + self.this = gridc.new_wxGridCellDateTimeRenderer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -214,10 +214,10 @@ class wxGridCellEnumRendererPtr(wxGridCellStringRendererPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellEnumRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellEnumRenderer(wxGridCellEnumRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellEnumRenderer,_args,_kwargs) + self.this = gridc.new_wxGridCellEnumRenderer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -229,10 +229,10 @@ class wxGridCellAutoWrapStringRendererPtr(wxGridCellStringRendererPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellAutoWrapStringRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellAutoWrapStringRenderer(wxGridCellAutoWrapStringRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellAutoWrapStringRenderer,_args,_kwargs) + self.this = gridc.new_wxGridCellAutoWrapStringRenderer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -244,73 +244,73 @@ class wxGridCellEditorPtr : self.this = this self.thisown = 0 def _setOORInfo(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor__setOORInfo,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor__setOORInfo(self, *_args, **_kwargs) return val def IsCreated(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_IsCreated,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_IsCreated(self, *_args, **_kwargs) return val def GetControl(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_GetControl,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_GetControl(self, *_args, **_kwargs) return val def SetControl(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_SetControl,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_SetControl(self, *_args, **_kwargs) return val def GetCellAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_GetCellAttr,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_GetCellAttr(self, *_args, **_kwargs) return val def SetCellAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_SetCellAttr,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_SetCellAttr(self, *_args, **_kwargs) return val def SetParameters(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_SetParameters,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_SetParameters(self, *_args, **_kwargs) return val def IncRef(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_IncRef,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_IncRef(self, *_args, **_kwargs) return val def DecRef(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_DecRef,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_DecRef(self, *_args, **_kwargs) return val def Create(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_Create,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_Create(self, *_args, **_kwargs) return val def BeginEdit(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_BeginEdit,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_BeginEdit(self, *_args, **_kwargs) return val def EndEdit(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_EndEdit,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_EndEdit(self, *_args, **_kwargs) return val def Reset(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_Reset,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_Reset(self, *_args, **_kwargs) return val def Clone(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_Clone,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_Clone(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_SetSize,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_SetSize(self, *_args, **_kwargs) return val def Show(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_Show,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_Show(self, *_args, **_kwargs) return val def PaintBackground(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_PaintBackground,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_PaintBackground(self, *_args, **_kwargs) return val def IsAcceptedKey(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_IsAcceptedKey,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_IsAcceptedKey(self, *_args, **_kwargs) return val def StartingKey(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_StartingKey,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_StartingKey(self, *_args, **_kwargs) return val def StartingClick(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_StartingClick,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_StartingClick(self, *_args, **_kwargs) return val def HandleReturn(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_HandleReturn,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_HandleReturn(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEditor_Destroy,(self,) + _args, _kwargs) + val = gridc.wxGridCellEditor_Destroy(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellEditor(wxGridCellEditorPtr): def __init__(self,this): self.this = this @@ -323,40 +323,40 @@ class wxPyGridCellEditorPtr(wxGridCellEditorPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor__setCallbackInfo,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor__setCallbackInfo(self, *_args, **_kwargs) return val def base_SetSize(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_SetSize,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_SetSize(self, *_args, **_kwargs) return val def base_Show(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_Show,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_Show(self, *_args, **_kwargs) return val def base_PaintBackground(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_PaintBackground,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_PaintBackground(self, *_args, **_kwargs) return val def base_IsAcceptedKey(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_IsAcceptedKey,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_IsAcceptedKey(self, *_args, **_kwargs) return val def base_StartingKey(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_StartingKey,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_StartingKey(self, *_args, **_kwargs) return val def base_StartingClick(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_StartingClick,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_StartingClick(self, *_args, **_kwargs) return val def base_HandleReturn(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_HandleReturn,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_HandleReturn(self, *_args, **_kwargs) return val def base_Destroy(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_Destroy,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_Destroy(self, *_args, **_kwargs) return val def base_SetParameters(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellEditor_base_SetParameters,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellEditor_base_SetParameters(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyGridCellEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyGridCellEditor(wxPyGridCellEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxPyGridCellEditor,_args,_kwargs) + self.this = gridc.new_wxPyGridCellEditor(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyGridCellEditor) self._setOORInfo(self) @@ -369,13 +369,13 @@ class wxGridCellTextEditorPtr(wxGridCellEditorPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellTextEditor_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridCellTextEditor_GetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellTextEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellTextEditor(wxGridCellTextEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellTextEditor,_args,_kwargs) + self.this = gridc.new_wxGridCellTextEditor(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -387,13 +387,13 @@ class wxGridCellNumberEditorPtr(wxGridCellTextEditorPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellNumberEditor_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridCellNumberEditor_GetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellNumberEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellNumberEditor(wxGridCellNumberEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellNumberEditor,_args,_kwargs) + self.this = gridc.new_wxGridCellNumberEditor(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -405,13 +405,13 @@ class wxGridCellFloatEditorPtr(wxGridCellTextEditorPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellFloatEditor_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridCellFloatEditor_GetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellFloatEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellFloatEditor(wxGridCellFloatEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellFloatEditor,_args,_kwargs) + self.this = gridc.new_wxGridCellFloatEditor(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -423,13 +423,13 @@ class wxGridCellBoolEditorPtr(wxGridCellEditorPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellBoolEditor_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridCellBoolEditor_GetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellBoolEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellBoolEditor(wxGridCellBoolEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellBoolEditor,_args,_kwargs) + self.this = gridc.new_wxGridCellBoolEditor(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -441,13 +441,13 @@ class wxGridCellChoiceEditorPtr(wxGridCellEditorPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellChoiceEditor_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridCellChoiceEditor_GetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellChoiceEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellChoiceEditor(wxGridCellChoiceEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellChoiceEditor,_args,_kwargs) + self.this = gridc.new_wxGridCellChoiceEditor(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -459,13 +459,13 @@ class wxGridCellEnumEditorPtr(wxGridCellChoiceEditorPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellEnumEditor_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridCellEnumEditor_GetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellEnumEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellEnumEditor(wxGridCellEnumEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellEnumEditor,_args,_kwargs) + self.this = gridc.new_wxGridCellEnumEditor(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -477,13 +477,13 @@ class wxGridCellAutoWrapStringEditorPtr(wxGridCellTextEditorPtr): self.this = this self.thisown = 0 def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAutoWrapStringEditor_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridCellAutoWrapStringEditor_GetValue(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellAutoWrapStringEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellAutoWrapStringEditor(wxGridCellAutoWrapStringEditorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellAutoWrapStringEditor,_args,_kwargs) + self.this = gridc.new_wxGridCellAutoWrapStringEditor(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -501,109 +501,112 @@ class wxGridCellAttrPtr : self.this = this self.thisown = 0 def _setOORInfo(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr__setOORInfo,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr__setOORInfo(self, *_args, **_kwargs) return val def Clone(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_Clone,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_Clone(self, *_args, **_kwargs) return val def MergeWith(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_MergeWith,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_MergeWith(self, *_args, **_kwargs) return val def IncRef(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_IncRef,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_IncRef(self, *_args, **_kwargs) return val def DecRef(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_DecRef,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_DecRef(self, *_args, **_kwargs) return val def SetTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetTextColour,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetTextColour(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetBackgroundColour(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetFont,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetFont(self, *_args, **_kwargs) return val def SetAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetAlignment,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetAlignment(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetSize,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetSize(self, *_args, **_kwargs) return val def SetOverflow(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetOverflow,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetOverflow(self, *_args, **_kwargs) return val def SetReadOnly(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetReadOnly,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetReadOnly(self, *_args, **_kwargs) return val def SetRenderer(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetRenderer,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetRenderer(self, *_args, **_kwargs) return val def SetEditor(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetEditor,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetEditor(self, *_args, **_kwargs) return val def SetKind(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetKind,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetKind(self, *_args, **_kwargs) return val def HasTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_HasTextColour,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_HasTextColour(self, *_args, **_kwargs) return val def HasBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_HasBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_HasBackgroundColour(self, *_args, **_kwargs) return val def HasFont(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_HasFont,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_HasFont(self, *_args, **_kwargs) return val def HasAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_HasAlignment,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_HasAlignment(self, *_args, **_kwargs) return val def HasRenderer(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_HasRenderer,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_HasRenderer(self, *_args, **_kwargs) return val def HasEditor(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_HasEditor,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_HasEditor(self, *_args, **_kwargs) return val def HasReadWriteMode(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_HasReadWriteMode,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_HasReadWriteMode(self, *_args, **_kwargs) + return val + def HasOverflowMode(self, *_args, **_kwargs): + val = gridc.wxGridCellAttr_HasOverflowMode(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetTextColour,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetFont(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetFont,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetAlignment,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetAlignment(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetSize,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetSize(self, *_args, **_kwargs) return val def GetOverflow(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetOverflow,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetOverflow(self, *_args, **_kwargs) return val def GetRenderer(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetRenderer,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetRenderer(self, *_args, **_kwargs) return val def GetEditor(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_GetEditor,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_GetEditor(self, *_args, **_kwargs) return val def IsReadOnly(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_IsReadOnly,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_IsReadOnly(self, *_args, **_kwargs) return val def SetDefAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttr_SetDefAttr,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttr_SetDefAttr(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellAttr(wxGridCellAttrPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellAttr,_args,_kwargs) + self.this = gridc.new_wxGridCellAttr(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -615,31 +618,31 @@ class wxGridCellAttrProviderPtr : self.this = this self.thisown = 0 def _setOORInfo(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttrProvider__setOORInfo,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttrProvider__setOORInfo(self, *_args, **_kwargs) return val def GetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttrProvider_GetAttr,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttrProvider_GetAttr(self, *_args, **_kwargs) return val def SetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttrProvider_SetAttr,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttrProvider_SetAttr(self, *_args, **_kwargs) return val def SetRowAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttrProvider_SetRowAttr,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttrProvider_SetRowAttr(self, *_args, **_kwargs) return val def SetColAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttrProvider_SetColAttr,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttrProvider_SetColAttr(self, *_args, **_kwargs) return val def UpdateAttrRows(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttrProvider_UpdateAttrRows,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttrProvider_UpdateAttrRows(self, *_args, **_kwargs) return val def UpdateAttrCols(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellAttrProvider_UpdateAttrCols,(self,) + _args, _kwargs) + val = gridc.wxGridCellAttrProvider_UpdateAttrCols(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellAttrProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridCellAttrProvider(wxGridCellAttrProviderPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellAttrProvider,_args,_kwargs) + self.this = gridc.new_wxGridCellAttrProvider(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -651,25 +654,25 @@ class wxPyGridCellAttrProviderPtr(wxGridCellAttrProviderPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellAttrProvider__setCallbackInfo,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellAttrProvider__setCallbackInfo(self, *_args, **_kwargs) return val def base_GetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellAttrProvider_base_GetAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellAttrProvider_base_GetAttr(self, *_args, **_kwargs) return val def base_SetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellAttrProvider_base_SetAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellAttrProvider_base_SetAttr(self, *_args, **_kwargs) return val def base_SetRowAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellAttrProvider_base_SetRowAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellAttrProvider_base_SetRowAttr(self, *_args, **_kwargs) return val def base_SetColAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridCellAttrProvider_base_SetColAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridCellAttrProvider_base_SetColAttr(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyGridCellAttrProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyGridCellAttrProvider(wxPyGridCellAttrProviderPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxPyGridCellAttrProvider,_args,_kwargs) + self.this = gridc.new_wxPyGridCellAttrProvider(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyGridCellAttrProvider) @@ -681,112 +684,112 @@ class wxGridTableBasePtr(wxObjectPtr): self.this = this self.thisown = 0 def _setOORInfo(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase__setOORInfo,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase__setOORInfo(self, *_args, **_kwargs) return val def SetAttrProvider(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetAttrProvider,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetAttrProvider(self, *_args, **_kwargs) return val def GetAttrProvider(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetAttrProvider,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetAttrProvider(self, *_args, **_kwargs) return val def SetView(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetView,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetView(self, *_args, **_kwargs) return val def GetView(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetView,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetView(self, *_args, **_kwargs) return val def GetNumberRows(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetNumberRows,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetNumberRows(self, *_args, **_kwargs) return val def GetNumberCols(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetNumberCols,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetNumberCols(self, *_args, **_kwargs) return val def IsEmptyCell(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_IsEmptyCell,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_IsEmptyCell(self, *_args, **_kwargs) return val def GetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetValue,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetValue(self, *_args, **_kwargs) return val def SetValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetValue,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetValue(self, *_args, **_kwargs) return val def GetTypeName(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetTypeName,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetTypeName(self, *_args, **_kwargs) return val def CanGetValueAs(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_CanGetValueAs,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_CanGetValueAs(self, *_args, **_kwargs) return val def CanSetValueAs(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_CanSetValueAs,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_CanSetValueAs(self, *_args, **_kwargs) return val def GetValueAsLong(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetValueAsLong,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetValueAsLong(self, *_args, **_kwargs) return val def GetValueAsDouble(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetValueAsDouble,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetValueAsDouble(self, *_args, **_kwargs) return val def GetValueAsBool(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetValueAsBool,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetValueAsBool(self, *_args, **_kwargs) return val def SetValueAsLong(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetValueAsLong,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetValueAsLong(self, *_args, **_kwargs) return val def SetValueAsDouble(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetValueAsDouble,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetValueAsDouble(self, *_args, **_kwargs) return val def SetValueAsBool(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetValueAsBool,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetValueAsBool(self, *_args, **_kwargs) return val def Clear(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_Clear,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_Clear(self, *_args, **_kwargs) return val def InsertRows(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_InsertRows,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_InsertRows(self, *_args, **_kwargs) return val def AppendRows(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_AppendRows,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_AppendRows(self, *_args, **_kwargs) return val def DeleteRows(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_DeleteRows,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_DeleteRows(self, *_args, **_kwargs) return val def InsertCols(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_InsertCols,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_InsertCols(self, *_args, **_kwargs) return val def AppendCols(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_AppendCols,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_AppendCols(self, *_args, **_kwargs) return val def DeleteCols(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_DeleteCols,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_DeleteCols(self, *_args, **_kwargs) return val def GetRowLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetRowLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetRowLabelValue(self, *_args, **_kwargs) return val def GetColLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetColLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetColLabelValue(self, *_args, **_kwargs) return val def SetRowLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetRowLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetRowLabelValue(self, *_args, **_kwargs) return val def SetColLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetColLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetColLabelValue(self, *_args, **_kwargs) return val def CanHaveAttributes(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_CanHaveAttributes,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_CanHaveAttributes(self, *_args, **_kwargs) return val def GetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_GetAttr,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_GetAttr(self, *_args, **_kwargs) return val def SetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetAttr,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetAttr(self, *_args, **_kwargs) return val def SetRowAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetRowAttr,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetRowAttr(self, *_args, **_kwargs) return val def SetColAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_SetColAttr,(self,) + _args, _kwargs) + val = gridc.wxGridTableBase_SetColAttr(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridTableBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridTableBase(wxGridTableBasePtr): def __init__(self,this): self.this = this @@ -799,73 +802,73 @@ class wxPyGridTableBasePtr(wxGridTableBasePtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase__setCallbackInfo,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase__setCallbackInfo(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_Destroy,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_Destroy(self, *_args, **_kwargs) return val def base_GetTypeName(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_GetTypeName,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_GetTypeName(self, *_args, **_kwargs) return val def base_CanGetValueAs(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_CanGetValueAs,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_CanGetValueAs(self, *_args, **_kwargs) return val def base_CanSetValueAs(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_CanSetValueAs,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_CanSetValueAs(self, *_args, **_kwargs) return val def base_Clear(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_Clear,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_Clear(self, *_args, **_kwargs) return val def base_InsertRows(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_InsertRows,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_InsertRows(self, *_args, **_kwargs) return val def base_AppendRows(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_AppendRows,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_AppendRows(self, *_args, **_kwargs) return val def base_DeleteRows(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_DeleteRows,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_DeleteRows(self, *_args, **_kwargs) return val def base_InsertCols(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_InsertCols,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_InsertCols(self, *_args, **_kwargs) return val def base_AppendCols(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_AppendCols,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_AppendCols(self, *_args, **_kwargs) return val def base_DeleteCols(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_DeleteCols,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_DeleteCols(self, *_args, **_kwargs) return val def base_GetRowLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_GetRowLabelValue,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_GetRowLabelValue(self, *_args, **_kwargs) return val def base_GetColLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_GetColLabelValue,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_GetColLabelValue(self, *_args, **_kwargs) return val def base_SetRowLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_SetRowLabelValue,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_SetRowLabelValue(self, *_args, **_kwargs) return val def base_SetColLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_SetColLabelValue,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_SetColLabelValue(self, *_args, **_kwargs) return val def base_CanHaveAttributes(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_CanHaveAttributes,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_CanHaveAttributes(self, *_args, **_kwargs) return val def base_GetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_GetAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_GetAttr(self, *_args, **_kwargs) return val def base_SetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_SetAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_SetAttr(self, *_args, **_kwargs) return val def base_SetRowAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_SetRowAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_SetRowAttr(self, *_args, **_kwargs) return val def base_SetColAttr(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_SetColAttr,(self,) + _args, _kwargs) + val = gridc.wxPyGridTableBase_base_SetColAttr(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyGridTableBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyGridTableBase(wxPyGridTableBasePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxPyGridTableBase,_args,_kwargs) + self.this = gridc.new_wxPyGridTableBase(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyGridTableBase) self._setOORInfo(self) @@ -878,10 +881,10 @@ class wxGridStringTablePtr(wxGridTableBasePtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridStringTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridStringTable(wxGridStringTablePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridStringTable,_args,_kwargs) + self.this = gridc.new_wxGridStringTable(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -899,34 +902,34 @@ class wxGridTableMessagePtr : except: pass def SetTableObject(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_SetTableObject,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_SetTableObject(self, *_args, **_kwargs) return val def GetTableObject(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_GetTableObject,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_GetTableObject(self, *_args, **_kwargs) return val def SetId(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_SetId,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_SetId(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_GetId,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_GetId(self, *_args, **_kwargs) return val def SetCommandInt(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_SetCommandInt,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_SetCommandInt(self, *_args, **_kwargs) return val def GetCommandInt(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_GetCommandInt,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_GetCommandInt(self, *_args, **_kwargs) return val def SetCommandInt2(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_SetCommandInt2,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_SetCommandInt2(self, *_args, **_kwargs) return val def GetCommandInt2(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableMessage_GetCommandInt2,(self,) + _args, _kwargs) + val = gridc.wxGridTableMessage_GetCommandInt2(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridTableMessage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridTableMessage(wxGridTableMessagePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridTableMessage,_args,_kwargs) + self.this = gridc.new_wxGridTableMessage(*_args,**_kwargs) self.thisown = 1 @@ -943,28 +946,28 @@ class wxGridCellCoordsPtr : except: pass def GetRow(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellCoords_GetRow,(self,) + _args, _kwargs) + val = gridc.wxGridCellCoords_GetRow(self, *_args, **_kwargs) return val def SetRow(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellCoords_SetRow,(self,) + _args, _kwargs) + val = gridc.wxGridCellCoords_SetRow(self, *_args, **_kwargs) return val def GetCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellCoords_GetCol,(self,) + _args, _kwargs) + val = gridc.wxGridCellCoords_GetCol(self, *_args, **_kwargs) return val def SetCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellCoords_SetCol,(self,) + _args, _kwargs) + val = gridc.wxGridCellCoords_SetCol(self, *_args, **_kwargs) return val def Set(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellCoords_Set,(self,) + _args, _kwargs) + val = gridc.wxGridCellCoords_Set(self, *_args, **_kwargs) return val def asTuple(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellCoords_asTuple,(self,) + _args, _kwargs) + val = gridc.wxGridCellCoords_asTuple(self, *_args, **_kwargs) return val def __cmp__(self, *_args, **_kwargs): - val = apply(gridc.wxGridCellCoords___cmp__,(self,) + _args, _kwargs) + val = gridc.wxGridCellCoords___cmp__(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridCellCoords instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def __str__(self): return str(self.asTuple()) def __repr__(self): return 'wxGridCellCoords'+str(self.asTuple()) @@ -977,7 +980,7 @@ class wxGridCellCoordsPtr : class wxGridCellCoords(wxGridCellCoordsPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridCellCoords,_args,_kwargs) + self.this = gridc.new_wxGridCellCoords(*_args,**_kwargs) self.thisown = 1 @@ -991,578 +994,590 @@ class wxGridPtr(wxScrolledWindowPtr): self.this = this self.thisown = 0 def CreateGrid(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_CreateGrid,(self,) + _args, _kwargs) + val = gridc.wxGrid_CreateGrid(self, *_args, **_kwargs) return val def SetSelectionMode(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetSelectionMode,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetSelectionMode(self, *_args, **_kwargs) return val def GetSelectionMode(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectionMode,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectionMode(self, *_args, **_kwargs) return val def GetNumberRows(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetNumberRows,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetNumberRows(self, *_args, **_kwargs) return val def GetNumberCols(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetNumberCols,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetNumberCols(self, *_args, **_kwargs) return val def ProcessTableMessage(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_ProcessTableMessage,(self,) + _args, _kwargs) + val = gridc.wxGrid_ProcessTableMessage(self, *_args, **_kwargs) return val def GetTable(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetTable,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetTable(self, *_args, **_kwargs) return val def SetTable(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetTable,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetTable(self, *_args, **_kwargs) return val def ClearGrid(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_ClearGrid,(self,) + _args, _kwargs) + val = gridc.wxGrid_ClearGrid(self, *_args, **_kwargs) return val def InsertRows(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_InsertRows,(self,) + _args, _kwargs) + val = gridc.wxGrid_InsertRows(self, *_args, **_kwargs) return val def AppendRows(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AppendRows,(self,) + _args, _kwargs) + val = gridc.wxGrid_AppendRows(self, *_args, **_kwargs) return val def DeleteRows(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DeleteRows,(self,) + _args, _kwargs) + val = gridc.wxGrid_DeleteRows(self, *_args, **_kwargs) return val def InsertCols(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_InsertCols,(self,) + _args, _kwargs) + val = gridc.wxGrid_InsertCols(self, *_args, **_kwargs) return val def AppendCols(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AppendCols,(self,) + _args, _kwargs) + val = gridc.wxGrid_AppendCols(self, *_args, **_kwargs) return val def DeleteCols(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DeleteCols,(self,) + _args, _kwargs) + val = gridc.wxGrid_DeleteCols(self, *_args, **_kwargs) return val def DrawCellHighlight(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DrawCellHighlight,(self,) + _args, _kwargs) + val = gridc.wxGrid_DrawCellHighlight(self, *_args, **_kwargs) return val def DrawTextRectangle(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DrawTextRectangle,(self,) + _args, _kwargs) + val = gridc.wxGrid_DrawTextRectangle(self, *_args, **_kwargs) return val def GetTextBoxSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetTextBoxSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetTextBoxSize(self, *_args, **_kwargs) return val def BeginBatch(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_BeginBatch,(self,) + _args, _kwargs) + val = gridc.wxGrid_BeginBatch(self, *_args, **_kwargs) return val def EndBatch(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_EndBatch,(self,) + _args, _kwargs) + val = gridc.wxGrid_EndBatch(self, *_args, **_kwargs) return val def GetBatchCount(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetBatchCount,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetBatchCount(self, *_args, **_kwargs) return val def ForceRefresh(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_ForceRefresh,(self,) + _args, _kwargs) + val = gridc.wxGrid_ForceRefresh(self, *_args, **_kwargs) return val def Refresh(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_Refresh,(self,) + _args, _kwargs) + val = gridc.wxGrid_Refresh(self, *_args, **_kwargs) return val def IsEditable(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsEditable,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsEditable(self, *_args, **_kwargs) return val def EnableEditing(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_EnableEditing,(self,) + _args, _kwargs) + val = gridc.wxGrid_EnableEditing(self, *_args, **_kwargs) return val def EnableCellEditControl(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_EnableCellEditControl,(self,) + _args, _kwargs) + val = gridc.wxGrid_EnableCellEditControl(self, *_args, **_kwargs) return val def DisableCellEditControl(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DisableCellEditControl,(self,) + _args, _kwargs) + val = gridc.wxGrid_DisableCellEditControl(self, *_args, **_kwargs) return val def CanEnableCellControl(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_CanEnableCellControl,(self,) + _args, _kwargs) + val = gridc.wxGrid_CanEnableCellControl(self, *_args, **_kwargs) return val def IsCellEditControlEnabled(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsCellEditControlEnabled,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsCellEditControlEnabled(self, *_args, **_kwargs) return val def IsCellEditControlShown(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsCellEditControlShown,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsCellEditControlShown(self, *_args, **_kwargs) return val def IsCurrentCellReadOnly(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsCurrentCellReadOnly,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsCurrentCellReadOnly(self, *_args, **_kwargs) return val def ShowCellEditControl(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_ShowCellEditControl,(self,) + _args, _kwargs) + val = gridc.wxGrid_ShowCellEditControl(self, *_args, **_kwargs) return val def HideCellEditControl(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_HideCellEditControl,(self,) + _args, _kwargs) + val = gridc.wxGrid_HideCellEditControl(self, *_args, **_kwargs) return val def SaveEditControlValue(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SaveEditControlValue,(self,) + _args, _kwargs) + val = gridc.wxGrid_SaveEditControlValue(self, *_args, **_kwargs) return val def XYToCell(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_XYToCell,(self,) + _args, _kwargs) + val = gridc.wxGrid_XYToCell(self, *_args, **_kwargs) if val: val = wxGridCellCoordsPtr(val) ; val.thisown = 1 return val def YToRow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_YToRow,(self,) + _args, _kwargs) + val = gridc.wxGrid_YToRow(self, *_args, **_kwargs) return val def XToCol(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_XToCol,(self,) + _args, _kwargs) + val = gridc.wxGrid_XToCol(self, *_args, **_kwargs) return val def YToEdgeOfRow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_YToEdgeOfRow,(self,) + _args, _kwargs) + val = gridc.wxGrid_YToEdgeOfRow(self, *_args, **_kwargs) return val def XToEdgeOfCol(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_XToEdgeOfCol,(self,) + _args, _kwargs) + val = gridc.wxGrid_XToEdgeOfCol(self, *_args, **_kwargs) return val def CellToRect(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_CellToRect,(self,) + _args, _kwargs) + val = gridc.wxGrid_CellToRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def GetGridCursorRow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetGridCursorRow,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetGridCursorRow(self, *_args, **_kwargs) return val def GetGridCursorCol(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetGridCursorCol,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetGridCursorCol(self, *_args, **_kwargs) return val def IsVisible(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsVisible,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsVisible(self, *_args, **_kwargs) return val def MakeCellVisible(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MakeCellVisible,(self,) + _args, _kwargs) + val = gridc.wxGrid_MakeCellVisible(self, *_args, **_kwargs) return val def SetGridCursor(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetGridCursor,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetGridCursor(self, *_args, **_kwargs) return val def MoveCursorUp(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorUp,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorUp(self, *_args, **_kwargs) return val def MoveCursorDown(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorDown,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorDown(self, *_args, **_kwargs) return val def MoveCursorLeft(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorLeft,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorLeft(self, *_args, **_kwargs) return val def MoveCursorRight(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorRight,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorRight(self, *_args, **_kwargs) return val def MovePageDown(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MovePageDown,(self,) + _args, _kwargs) + val = gridc.wxGrid_MovePageDown(self, *_args, **_kwargs) return val def MovePageUp(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MovePageUp,(self,) + _args, _kwargs) + val = gridc.wxGrid_MovePageUp(self, *_args, **_kwargs) return val def MoveCursorUpBlock(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorUpBlock,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorUpBlock(self, *_args, **_kwargs) return val def MoveCursorDownBlock(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorDownBlock,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorDownBlock(self, *_args, **_kwargs) return val def MoveCursorLeftBlock(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorLeftBlock,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorLeftBlock(self, *_args, **_kwargs) return val def MoveCursorRightBlock(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_MoveCursorRightBlock,(self,) + _args, _kwargs) + val = gridc.wxGrid_MoveCursorRightBlock(self, *_args, **_kwargs) return val def GetDefaultRowLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultRowLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultRowLabelSize(self, *_args, **_kwargs) return val def GetRowLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetRowLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetRowLabelSize(self, *_args, **_kwargs) return val def GetDefaultColLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultColLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultColLabelSize(self, *_args, **_kwargs) return val def GetColLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetColLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetColLabelSize(self, *_args, **_kwargs) return val def GetLabelBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetLabelBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetLabelBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetLabelTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetLabelTextColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetLabelTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetLabelFont(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetLabelFont,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetLabelFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetRowLabelAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetRowLabelAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetRowLabelAlignment(self, *_args, **_kwargs) return val def GetColLabelAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetColLabelAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetColLabelAlignment(self, *_args, **_kwargs) return val def GetColLabelTextOrientation(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetColLabelTextOrientation,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetColLabelTextOrientation(self, *_args, **_kwargs) return val def GetRowLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetRowLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetRowLabelValue(self, *_args, **_kwargs) return val def GetColLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetColLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetColLabelValue(self, *_args, **_kwargs) return val def GetGridLineColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetGridLineColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetGridLineColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetCellHighlightColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellHighlightColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellHighlightColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetCellHighlightPenWidth(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellHighlightPenWidth,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellHighlightPenWidth(self, *_args, **_kwargs) return val def GetCellHighlightROPenWidth(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellHighlightROPenWidth,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellHighlightROPenWidth(self, *_args, **_kwargs) return val def SetRowLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetRowLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetRowLabelSize(self, *_args, **_kwargs) return val def SetColLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColLabelSize(self, *_args, **_kwargs) return val def SetLabelBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetLabelBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetLabelBackgroundColour(self, *_args, **_kwargs) return val def SetLabelTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetLabelTextColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetLabelTextColour(self, *_args, **_kwargs) return val def SetLabelFont(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetLabelFont,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetLabelFont(self, *_args, **_kwargs) return val def SetRowLabelAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetRowLabelAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetRowLabelAlignment(self, *_args, **_kwargs) return val def SetColLabelAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColLabelAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColLabelAlignment(self, *_args, **_kwargs) return val def SetColLabelTextOrientation(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColLabelTextOrientation,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColLabelTextOrientation(self, *_args, **_kwargs) return val def SetRowLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetRowLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetRowLabelValue(self, *_args, **_kwargs) return val def SetColLabelValue(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColLabelValue,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColLabelValue(self, *_args, **_kwargs) return val def SetGridLineColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetGridLineColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetGridLineColour(self, *_args, **_kwargs) return val def SetCellHighlightColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellHighlightColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellHighlightColour(self, *_args, **_kwargs) return val def SetCellHighlightPenWidth(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellHighlightPenWidth,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellHighlightPenWidth(self, *_args, **_kwargs) return val def SetCellHighlightROPenWidth(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellHighlightROPenWidth,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellHighlightROPenWidth(self, *_args, **_kwargs) return val def EnableDragRowSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_EnableDragRowSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_EnableDragRowSize(self, *_args, **_kwargs) return val def DisableDragRowSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DisableDragRowSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_DisableDragRowSize(self, *_args, **_kwargs) return val def CanDragRowSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_CanDragRowSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_CanDragRowSize(self, *_args, **_kwargs) return val def EnableDragColSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_EnableDragColSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_EnableDragColSize(self, *_args, **_kwargs) return val def DisableDragColSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DisableDragColSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_DisableDragColSize(self, *_args, **_kwargs) return val def CanDragColSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_CanDragColSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_CanDragColSize(self, *_args, **_kwargs) return val def EnableDragGridSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_EnableDragGridSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_EnableDragGridSize(self, *_args, **_kwargs) return val def DisableDragGridSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DisableDragGridSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_DisableDragGridSize(self, *_args, **_kwargs) return val def CanDragGridSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_CanDragGridSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_CanDragGridSize(self, *_args, **_kwargs) return val def SetAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetAttr,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetAttr(self, *_args, **_kwargs) return val def SetRowAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetRowAttr,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetRowAttr(self, *_args, **_kwargs) return val def SetColAttr(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColAttr,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColAttr(self, *_args, **_kwargs) return val def SetColFormatBool(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColFormatBool,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColFormatBool(self, *_args, **_kwargs) return val def SetColFormatNumber(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColFormatNumber,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColFormatNumber(self, *_args, **_kwargs) return val def SetColFormatFloat(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColFormatFloat,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColFormatFloat(self, *_args, **_kwargs) return val def SetColFormatCustom(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColFormatCustom,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColFormatCustom(self, *_args, **_kwargs) return val def EnableGridLines(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_EnableGridLines,(self,) + _args, _kwargs) + val = gridc.wxGrid_EnableGridLines(self, *_args, **_kwargs) return val def GridLinesEnabled(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GridLinesEnabled,(self,) + _args, _kwargs) + val = gridc.wxGrid_GridLinesEnabled(self, *_args, **_kwargs) return val def GetDefaultRowSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultRowSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultRowSize(self, *_args, **_kwargs) return val def GetRowSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetRowSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetRowSize(self, *_args, **_kwargs) return val def GetDefaultColSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultColSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultColSize(self, *_args, **_kwargs) return val def GetColSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetColSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetColSize(self, *_args, **_kwargs) return val def GetDefaultCellBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultCellBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultCellBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetCellBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetDefaultCellTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultCellTextColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultCellTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetCellTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellTextColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetDefaultCellFont(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultCellFont,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultCellFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetCellFont(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellFont,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetDefaultCellAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultCellAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultCellAlignment(self, *_args, **_kwargs) return val def GetCellAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellAlignment(self, *_args, **_kwargs) return val def GetDefaultCellOverflow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultCellOverflow,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultCellOverflow(self, *_args, **_kwargs) return val def GetCellOverflow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellOverflow,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellOverflow(self, *_args, **_kwargs) return val def GetCellSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellSize(self, *_args, **_kwargs) return val def SetDefaultRowSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultRowSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultRowSize(self, *_args, **_kwargs) return val def SetRowSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetRowSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetRowSize(self, *_args, **_kwargs) return val def SetDefaultColSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultColSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultColSize(self, *_args, **_kwargs) return val def SetColSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColSize(self, *_args, **_kwargs) return val def AutoSizeColumn(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AutoSizeColumn,(self,) + _args, _kwargs) + val = gridc.wxGrid_AutoSizeColumn(self, *_args, **_kwargs) return val def AutoSizeRow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AutoSizeRow,(self,) + _args, _kwargs) + val = gridc.wxGrid_AutoSizeRow(self, *_args, **_kwargs) return val def AutoSizeColumns(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AutoSizeColumns,(self,) + _args, _kwargs) + val = gridc.wxGrid_AutoSizeColumns(self, *_args, **_kwargs) return val def AutoSizeRows(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AutoSizeRows,(self,) + _args, _kwargs) + val = gridc.wxGrid_AutoSizeRows(self, *_args, **_kwargs) return val def AutoSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AutoSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_AutoSize(self, *_args, **_kwargs) return val def AutoSizeRowLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AutoSizeRowLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_AutoSizeRowLabelSize(self, *_args, **_kwargs) return val def AutoSizeColLabelSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_AutoSizeColLabelSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_AutoSizeColLabelSize(self, *_args, **_kwargs) return val def SetColMinimalWidth(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetColMinimalWidth,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetColMinimalWidth(self, *_args, **_kwargs) return val def SetRowMinimalHeight(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetRowMinimalHeight,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetRowMinimalHeight(self, *_args, **_kwargs) + return val + def SetColMinimalAcceptableWidth(self, *_args, **_kwargs): + val = gridc.wxGrid_SetColMinimalAcceptableWidth(self, *_args, **_kwargs) + return val + def SetRowMinimalAcceptableHeight(self, *_args, **_kwargs): + val = gridc.wxGrid_SetRowMinimalAcceptableHeight(self, *_args, **_kwargs) + return val + def GetColMinimalAcceptableWidth(self, *_args, **_kwargs): + val = gridc.wxGrid_GetColMinimalAcceptableWidth(self, *_args, **_kwargs) + return val + def GetRowMinimalAcceptableHeight(self, *_args, **_kwargs): + val = gridc.wxGrid_GetRowMinimalAcceptableHeight(self, *_args, **_kwargs) return val def SetDefaultCellBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultCellBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultCellBackgroundColour(self, *_args, **_kwargs) return val def SetCellBackgroundColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellBackgroundColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellBackgroundColour(self, *_args, **_kwargs) return val def SetDefaultCellTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultCellTextColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultCellTextColour(self, *_args, **_kwargs) return val def SetCellTextColour(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellTextColour,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellTextColour(self, *_args, **_kwargs) return val def SetDefaultCellFont(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultCellFont,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultCellFont(self, *_args, **_kwargs) return val def SetCellFont(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellFont,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellFont(self, *_args, **_kwargs) return val def SetDefaultCellAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultCellAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultCellAlignment(self, *_args, **_kwargs) return val def SetCellAlignment(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellAlignment,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellAlignment(self, *_args, **_kwargs) return val def SetDefaultCellOverflow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultCellOverflow,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultCellOverflow(self, *_args, **_kwargs) return val def SetCellOverflow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellOverflow,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellOverflow(self, *_args, **_kwargs) return val def SetCellSize(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellSize,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellSize(self, *_args, **_kwargs) return val def SetDefaultRenderer(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultRenderer,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultRenderer(self, *_args, **_kwargs) return val def SetCellRenderer(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellRenderer,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellRenderer(self, *_args, **_kwargs) return val def GetDefaultRenderer(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultRenderer,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultRenderer(self, *_args, **_kwargs) return val def GetCellRenderer(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellRenderer,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellRenderer(self, *_args, **_kwargs) return val def SetDefaultEditor(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetDefaultEditor,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetDefaultEditor(self, *_args, **_kwargs) return val def SetCellEditor(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellEditor,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellEditor(self, *_args, **_kwargs) return val def GetDefaultEditor(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultEditor,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultEditor(self, *_args, **_kwargs) return val def GetCellEditor(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellEditor,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellEditor(self, *_args, **_kwargs) return val def GetCellValue(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetCellValue,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetCellValue(self, *_args, **_kwargs) return val def SetCellValue(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetCellValue,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetCellValue(self, *_args, **_kwargs) return val def IsReadOnly(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsReadOnly,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsReadOnly(self, *_args, **_kwargs) return val def SetReadOnly(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetReadOnly,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetReadOnly(self, *_args, **_kwargs) return val def SelectRow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SelectRow,(self,) + _args, _kwargs) + val = gridc.wxGrid_SelectRow(self, *_args, **_kwargs) return val def SelectCol(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SelectCol,(self,) + _args, _kwargs) + val = gridc.wxGrid_SelectCol(self, *_args, **_kwargs) return val def SelectBlock(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SelectBlock,(self,) + _args, _kwargs) + val = gridc.wxGrid_SelectBlock(self, *_args, **_kwargs) return val def SelectAll(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SelectAll,(self,) + _args, _kwargs) + val = gridc.wxGrid_SelectAll(self, *_args, **_kwargs) return val def IsSelection(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsSelection,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsSelection(self, *_args, **_kwargs) return val def ClearSelection(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_ClearSelection,(self,) + _args, _kwargs) + val = gridc.wxGrid_ClearSelection(self, *_args, **_kwargs) return val def IsInSelection(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_IsInSelection,(self,) + _args, _kwargs) + val = gridc.wxGrid_IsInSelection(self, *_args, **_kwargs) return val def GetSelectedCells(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectedCells,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectedCells(self, *_args, **_kwargs) return val def GetSelectionBlockTopLeft(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectionBlockTopLeft,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectionBlockTopLeft(self, *_args, **_kwargs) return val def GetSelectionBlockBottomRight(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectionBlockBottomRight,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectionBlockBottomRight(self, *_args, **_kwargs) return val def GetSelectedRows(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectedRows,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectedRows(self, *_args, **_kwargs) return val def GetSelectedCols(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectedCols,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectedCols(self, *_args, **_kwargs) return val def DeselectRow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DeselectRow,(self,) + _args, _kwargs) + val = gridc.wxGrid_DeselectRow(self, *_args, **_kwargs) return val def DeselectCol(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DeselectCol,(self,) + _args, _kwargs) + val = gridc.wxGrid_DeselectCol(self, *_args, **_kwargs) return val def DeselectCell(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_DeselectCell,(self,) + _args, _kwargs) + val = gridc.wxGrid_DeselectCell(self, *_args, **_kwargs) return val def BlockToDeviceRect(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_BlockToDeviceRect,(self,) + _args, _kwargs) + val = gridc.wxGrid_BlockToDeviceRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def GetSelectionBackground(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectionBackground,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectionBackground(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetSelectionForeground(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetSelectionForeground,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetSelectionForeground(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetSelectionBackground(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetSelectionBackground,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetSelectionBackground(self, *_args, **_kwargs) return val def SetSelectionForeground(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetSelectionForeground,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetSelectionForeground(self, *_args, **_kwargs) return val def RegisterDataType(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_RegisterDataType,(self,) + _args, _kwargs) + val = gridc.wxGrid_RegisterDataType(self, *_args, **_kwargs) return val def GetDefaultEditorForCell(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultEditorForCell,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultEditorForCell(self, *_args, **_kwargs) return val def GetDefaultRendererForCell(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultRendererForCell,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultRendererForCell(self, *_args, **_kwargs) return val def GetDefaultEditorForType(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultEditorForType,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultEditorForType(self, *_args, **_kwargs) return val def GetDefaultRendererForType(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetDefaultRendererForType,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetDefaultRendererForType(self, *_args, **_kwargs) return val def SetMargins(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_SetMargins,(self,) + _args, _kwargs) + val = gridc.wxGrid_SetMargins(self, *_args, **_kwargs) return val def GetGridWindow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetGridWindow,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetGridWindow(self, *_args, **_kwargs) return val def GetGridRowLabelWindow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetGridRowLabelWindow,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetGridRowLabelWindow(self, *_args, **_kwargs) return val def GetGridColLabelWindow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetGridColLabelWindow,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetGridColLabelWindow(self, *_args, **_kwargs) return val def GetGridCornerLabelWindow(self, *_args, **_kwargs): - val = apply(gridc.wxGrid_GetGridCornerLabelWindow,(self,) + _args, _kwargs) + val = gridc.wxGrid_GetGridCornerLabelWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGrid instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGrid(wxGridPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGrid,_args,_kwargs) + self.this = gridc.new_wxGrid(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -1574,35 +1589,35 @@ class wxGridEventPtr(wxNotifyEventPtr): self.this = this self.thisown = 0 def GetRow(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_GetRow,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_GetRow(self, *_args, **_kwargs) return val def GetCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_GetCol,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_GetCol(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_GetPosition,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def Selecting(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_Selecting,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_Selecting(self, *_args, **_kwargs) return val def ControlDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_ControlDown,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_ControlDown(self, *_args, **_kwargs) return val def MetaDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_MetaDown,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_MetaDown(self, *_args, **_kwargs) return val def ShiftDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_ShiftDown,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_ShiftDown(self, *_args, **_kwargs) return val def AltDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridEvent_AltDown,(self,) + _args, _kwargs) + val = gridc.wxGridEvent_AltDown(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridEvent(wxGridEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridEvent,_args,_kwargs) + self.this = gridc.new_wxGridEvent(*_args,**_kwargs) self.thisown = 1 @@ -1613,29 +1628,29 @@ class wxGridSizeEventPtr(wxNotifyEventPtr): self.this = this self.thisown = 0 def GetRowOrCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridSizeEvent_GetRowOrCol,(self,) + _args, _kwargs) + val = gridc.wxGridSizeEvent_GetRowOrCol(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(gridc.wxGridSizeEvent_GetPosition,(self,) + _args, _kwargs) + val = gridc.wxGridSizeEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def ControlDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridSizeEvent_ControlDown,(self,) + _args, _kwargs) + val = gridc.wxGridSizeEvent_ControlDown(self, *_args, **_kwargs) return val def MetaDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridSizeEvent_MetaDown,(self,) + _args, _kwargs) + val = gridc.wxGridSizeEvent_MetaDown(self, *_args, **_kwargs) return val def ShiftDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridSizeEvent_ShiftDown,(self,) + _args, _kwargs) + val = gridc.wxGridSizeEvent_ShiftDown(self, *_args, **_kwargs) return val def AltDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridSizeEvent_AltDown,(self,) + _args, _kwargs) + val = gridc.wxGridSizeEvent_AltDown(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridSizeEvent(wxGridSizeEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridSizeEvent,_args,_kwargs) + self.this = gridc.new_wxGridSizeEvent(*_args,**_kwargs) self.thisown = 1 @@ -1646,45 +1661,45 @@ class wxGridRangeSelectEventPtr(wxNotifyEventPtr): self.this = this self.thisown = 0 def GetTopLeftCoords(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_GetTopLeftCoords,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_GetTopLeftCoords(self, *_args, **_kwargs) if val: val = wxGridCellCoordsPtr(val) ; val.thisown = 1 return val def GetBottomRightCoords(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_GetBottomRightCoords,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_GetBottomRightCoords(self, *_args, **_kwargs) if val: val = wxGridCellCoordsPtr(val) ; val.thisown = 1 return val def GetTopRow(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_GetTopRow,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_GetTopRow(self, *_args, **_kwargs) return val def GetBottomRow(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_GetBottomRow,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_GetBottomRow(self, *_args, **_kwargs) return val def GetLeftCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_GetLeftCol,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_GetLeftCol(self, *_args, **_kwargs) return val def GetRightCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_GetRightCol,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_GetRightCol(self, *_args, **_kwargs) return val def Selecting(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_Selecting,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_Selecting(self, *_args, **_kwargs) return val def ControlDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_ControlDown,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_ControlDown(self, *_args, **_kwargs) return val def MetaDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_MetaDown,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_MetaDown(self, *_args, **_kwargs) return val def ShiftDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_ShiftDown,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_ShiftDown(self, *_args, **_kwargs) return val def AltDown(self, *_args, **_kwargs): - val = apply(gridc.wxGridRangeSelectEvent_AltDown,(self,) + _args, _kwargs) + val = gridc.wxGridRangeSelectEvent_AltDown(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridRangeSelectEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridRangeSelectEvent(wxGridRangeSelectEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridRangeSelectEvent,_args,_kwargs) + self.this = gridc.new_wxGridRangeSelectEvent(*_args,**_kwargs) self.thisown = 1 @@ -1695,28 +1710,28 @@ class wxGridEditorCreatedEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetRow(self, *_args, **_kwargs): - val = apply(gridc.wxGridEditorCreatedEvent_GetRow,(self,) + _args, _kwargs) + val = gridc.wxGridEditorCreatedEvent_GetRow(self, *_args, **_kwargs) return val def GetCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridEditorCreatedEvent_GetCol,(self,) + _args, _kwargs) + val = gridc.wxGridEditorCreatedEvent_GetCol(self, *_args, **_kwargs) return val def GetControl(self, *_args, **_kwargs): - val = apply(gridc.wxGridEditorCreatedEvent_GetControl,(self,) + _args, _kwargs) + val = gridc.wxGridEditorCreatedEvent_GetControl(self, *_args, **_kwargs) return val def SetRow(self, *_args, **_kwargs): - val = apply(gridc.wxGridEditorCreatedEvent_SetRow,(self,) + _args, _kwargs) + val = gridc.wxGridEditorCreatedEvent_SetRow(self, *_args, **_kwargs) return val def SetCol(self, *_args, **_kwargs): - val = apply(gridc.wxGridEditorCreatedEvent_SetCol,(self,) + _args, _kwargs) + val = gridc.wxGridEditorCreatedEvent_SetCol(self, *_args, **_kwargs) return val def SetControl(self, *_args, **_kwargs): - val = apply(gridc.wxGridEditorCreatedEvent_SetControl,(self,) + _args, _kwargs) + val = gridc.wxGridEditorCreatedEvent_SetControl(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridEditorCreatedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridEditorCreatedEvent(wxGridEditorCreatedEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gridc.new_wxGridEditorCreatedEvent,_args,_kwargs) + self.this = gridc.new_wxGridEditorCreatedEvent(*_args,**_kwargs) self.thisown = 1 diff --git a/wxPython/src/msw/help.cpp b/wxPython/src/msw/help.cpp index 8878e4ca75..10fe22210b 100644 --- a/wxPython/src/msw/help.cpp +++ b/wxPython/src/msw/help.cpp @@ -719,7 +719,7 @@ static PyObject *_wrap_wxHelpProvider_ShowHelp(PyObject *self, PyObject *args, P PyObject * _resultobj; bool _result; wxHelpProvider * _arg0; - wxWindowBase * _arg1; + wxWindow * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; char *_kwnames[] = { "self","window", NULL }; @@ -736,8 +736,8 @@ static PyObject *_wrap_wxHelpProvider_ShowHelp(PyObject *self, PyObject *args, P } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindowBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHelpProvider_ShowHelp. Expected _wxWindowBase_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHelpProvider_ShowHelp. Expected _wxWindow_p."); return NULL; } } @@ -755,7 +755,7 @@ static PyObject *_wrap_wxHelpProvider_ShowHelp(PyObject *self, PyObject *args, P static PyObject *_wrap_wxHelpProvider_AddHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxHelpProvider * _arg0; - wxWindowBase * _arg1; + wxWindow * _arg1; wxString * _arg2; PyObject * _argo0 = 0; PyObject * _argo1 = 0; @@ -774,8 +774,8 @@ static PyObject *_wrap_wxHelpProvider_AddHelp(PyObject *self, PyObject *args, Py } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindowBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHelpProvider_AddHelp. Expected _wxWindowBase_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHelpProvider_AddHelp. Expected _wxWindow_p."); return NULL; } } diff --git a/wxPython/src/msw/help.py b/wxPython/src/msw/help.py index ac1612ba19..3e4ae411aa 100644 --- a/wxPython/src/msw/help.py +++ b/wxPython/src/msw/help.py @@ -33,29 +33,29 @@ class wxHelpEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def GetPosition(self, *_args, **_kwargs): - val = apply(helpc.wxHelpEvent_GetPosition,(self,) + _args, _kwargs) + val = helpc.wxHelpEvent_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) return val def SetPosition(self, *_args, **_kwargs): - val = apply(helpc.wxHelpEvent_SetPosition,(self,) + _args, _kwargs) + val = helpc.wxHelpEvent_SetPosition(self, *_args, **_kwargs) return val def GetLink(self, *_args, **_kwargs): - val = apply(helpc.wxHelpEvent_GetLink,(self,) + _args, _kwargs) + val = helpc.wxHelpEvent_GetLink(self, *_args, **_kwargs) return val def SetLink(self, *_args, **_kwargs): - val = apply(helpc.wxHelpEvent_SetLink,(self,) + _args, _kwargs) + val = helpc.wxHelpEvent_SetLink(self, *_args, **_kwargs) return val def GetTarget(self, *_args, **_kwargs): - val = apply(helpc.wxHelpEvent_GetTarget,(self,) + _args, _kwargs) + val = helpc.wxHelpEvent_GetTarget(self, *_args, **_kwargs) return val def SetTarget(self, *_args, **_kwargs): - val = apply(helpc.wxHelpEvent_SetTarget,(self,) + _args, _kwargs) + val = helpc.wxHelpEvent_SetTarget(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHelpEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHelpEvent(wxHelpEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(helpc.new_wxHelpEvent,_args,_kwargs) + self.this = helpc.new_wxHelpEvent(*_args,**_kwargs) self.thisown = 1 @@ -72,16 +72,16 @@ class wxContextHelpPtr(wxObjectPtr): except: pass def BeginContextHelp(self, *_args, **_kwargs): - val = apply(helpc.wxContextHelp_BeginContextHelp,(self,) + _args, _kwargs) + val = helpc.wxContextHelp_BeginContextHelp(self, *_args, **_kwargs) return val def EndContextHelp(self, *_args, **_kwargs): - val = apply(helpc.wxContextHelp_EndContextHelp,(self,) + _args, _kwargs) + val = helpc.wxContextHelp_EndContextHelp(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxContextHelp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxContextHelp(wxContextHelpPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(helpc.new_wxContextHelp,_args,_kwargs) + self.this = helpc.new_wxContextHelp(*_args,**_kwargs) self.thisown = 1 @@ -92,10 +92,10 @@ class wxContextHelpButtonPtr(wxBitmapButtonPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxContextHelpButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxContextHelpButton(wxContextHelpButtonPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(helpc.new_wxContextHelpButton,_args,_kwargs) + self.this = helpc.new_wxContextHelpButton(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -107,22 +107,22 @@ class wxHelpProviderPtr : self.this = this self.thisown = 0 def GetHelp(self, *_args, **_kwargs): - val = apply(helpc.wxHelpProvider_GetHelp,(self,) + _args, _kwargs) + val = helpc.wxHelpProvider_GetHelp(self, *_args, **_kwargs) return val def ShowHelp(self, *_args, **_kwargs): - val = apply(helpc.wxHelpProvider_ShowHelp,(self,) + _args, _kwargs) + val = helpc.wxHelpProvider_ShowHelp(self, *_args, **_kwargs) return val def AddHelp(self, *_args, **_kwargs): - val = apply(helpc.wxHelpProvider_AddHelp,(self,) + _args, _kwargs) + val = helpc.wxHelpProvider_AddHelp(self, *_args, **_kwargs) return val def AddHelpById(self, *_args, **_kwargs): - val = apply(helpc.wxHelpProvider_AddHelpById,(self,) + _args, _kwargs) + val = helpc.wxHelpProvider_AddHelpById(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(helpc.wxHelpProvider_Destroy,(self,) + _args, _kwargs) + val = helpc.wxHelpProvider_Destroy(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHelpProvider(wxHelpProviderPtr): def __init__(self,this): self.this = this @@ -135,10 +135,10 @@ class wxSimpleHelpProviderPtr(wxHelpProviderPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSimpleHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSimpleHelpProvider(wxSimpleHelpProviderPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(helpc.new_wxSimpleHelpProvider,_args,_kwargs) + self.this = helpc.new_wxSimpleHelpProvider(*_args,**_kwargs) self.thisown = 1 @@ -149,12 +149,12 @@ class wxSimpleHelpProvider(wxSimpleHelpProviderPtr): #-------------- FUNCTION WRAPPERS ------------------ def wxHelpProvider_Set(*_args, **_kwargs): - val = apply(helpc.wxHelpProvider_Set,_args,_kwargs) + val = helpc.wxHelpProvider_Set(*_args,**_kwargs) if val: val = wxHelpProviderPtr(val) return val def wxHelpProvider_Get(*_args, **_kwargs): - val = apply(helpc.wxHelpProvider_Get,_args,_kwargs) + val = helpc.wxHelpProvider_Get(*_args,**_kwargs) if val: val = wxHelpProviderPtr(val) return val diff --git a/wxPython/src/msw/html.cpp b/wxPython/src/msw/html.cpp index 8feb7432f5..a2c1ebc94e 100644 --- a/wxPython/src/msw/html.cpp +++ b/wxPython/src/msw/html.cpp @@ -249,7 +249,7 @@ public: wxPyHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxHW_SCROLLBAR_AUTO, + long style = wxHW_DEFAULT_STYLE, const wxString& name = wxPyHtmlWindowNameStr) : wxHtmlWindow(parent, id, pos, size, style, name) {}; wxPyHtmlWindow() : wxHtmlWindow() {}; @@ -1314,7 +1314,7 @@ static void *SwigwxHtmlWinParserTowxObject(void *ptr) { static PyObject *_wrap_new_wxHtmlWinParser(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxHtmlWinParser * _result; - wxHtmlWindow * _arg0 = (wxHtmlWindow *) NULL; + wxPyHtmlWindow * _arg0 = (wxPyHtmlWindow *) NULL; PyObject * _argo0 = 0; char *_kwnames[] = { "wnd", NULL }; char _ptemp[128]; @@ -1324,8 +1324,8 @@ static PyObject *_wrap_new_wxHtmlWinParser(PyObject *self, PyObject *args, PyObj return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxHtmlWinParser. Expected _wxHtmlWindow_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyHtmlWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxHtmlWinParser. Expected _wxPyHtmlWindow_p."); return NULL; } } @@ -1469,7 +1469,7 @@ static PyObject *_wrap_wxHtmlWinParser_GetCharWidth(PyObject *self, PyObject *ar #define wxHtmlWinParser_GetWindow(_swigobj) (_swigobj->GetWindow()) static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxHtmlWindow * _result; + wxPyHtmlWindow * _result; wxHtmlWinParser * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; @@ -1486,7 +1486,7 @@ static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlWindow *)wxHtmlWinParser_GetWindow(_arg0); + _result = (wxPyHtmlWindow *)wxHtmlWinParser_GetWindow(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2651,32 +2651,24 @@ static PyObject *_wrap_wxHtmlWinTagHandler_ParseInner(PyObject *self, PyObject * return _resultobj; } -static void *SwigwxHtmlCellTowxObject(void *ptr) { - wxHtmlCell *src; - wxObject *dest; - src = (wxHtmlCell *) ptr; - dest = (wxObject *) src; - return (void *) dest; -} - -#define new_wxHtmlCell() (new wxHtmlCell()) -static PyObject *_wrap_new_wxHtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxHtmlSelection() (new wxHtmlSelection()) +static PyObject *_wrap_new_wxHtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxHtmlCell * _result; + wxHtmlSelection * _result; char *_kwnames[] = { NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlCell",_kwnames)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlSelection",_kwnames)) return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlCell *)new_wxHtmlCell(); + _result = (wxHtmlSelection *)new_wxHtmlSelection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlSelection_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -2685,175 +2677,276 @@ static PyObject *_wrap_new_wxHtmlCell(PyObject *self, PyObject *args, PyObject * return _resultobj; } -#define wxHtmlCell_GetPosX(_swigobj) (_swigobj->GetPosX()) -static PyObject *_wrap_wxHtmlCell_GetPosX(PyObject *self, PyObject *args, PyObject *kwargs) { +#define delete_wxHtmlSelection(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxHtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxHtmlCell * _arg0; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetPosX",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxHtmlSelection",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetPosX. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxHtmlSelection. Expected _wxHtmlSelection_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxHtmlCell_GetPosX(_arg0); + delete_wxHtmlSelection(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxHtmlCell_GetPosY(_swigobj) (_swigobj->GetPosY()) -static PyObject *_wrap_wxHtmlCell_GetPosY(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_Set(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->Set(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxHtmlSelection_Set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxHtmlCell * _arg0; + wxHtmlSelection * _arg0; + wxPoint * _arg1; + wxHtmlCell * _arg2; + wxPoint * _arg3; + wxHtmlCell * _arg4; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + wxPoint temp; + PyObject * _obj1 = 0; + PyObject * _argo2 = 0; + wxPoint temp0; + PyObject * _obj3 = 0; + PyObject * _argo4 = 0; + char *_kwnames[] = { "self","fromPos","fromCell","toPos","toCell", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetPosY",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOOO:wxHtmlSelection_Set",_kwnames,&_argo0,&_obj1,&_argo2,&_obj3,&_argo4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetPosY. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_Set. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxHtmlSelection_Set. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + _arg3 = &temp0; + if (! wxPoint_helper(_obj3, &_arg3)) + return NULL; +} + if (_argo4) { + if (_argo4 == Py_None) { _arg4 = NULL; } + else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxHtmlSelection_Set. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxHtmlCell_GetPosY(_arg0); + wxHtmlSelection_Set(_arg0,*_arg1,_arg2,*_arg3,_arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxHtmlCell_GetWidth(_swigobj) (_swigobj->GetWidth()) -static PyObject *_wrap_wxHtmlCell_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_SetCells(_swigobj,_swigarg0,_swigarg1) (_swigobj->Set(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxHtmlSelection_SetCells(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxHtmlCell * _arg0; + wxHtmlSelection * _arg0; + wxHtmlCell * _arg1; + wxHtmlCell * _arg2; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","fromCell","toCell", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxHtmlSelection_SetCells",_kwnames,&_argo0,&_argo1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_SetCells. Expected _wxHtmlSelection_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlSelection_SetCells. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxHtmlSelection_SetCells. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_SetCells(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_GetFromCell(_swigobj) (_swigobj->GetFromCell()) +static PyObject *_wrap_wxHtmlSelection_GetFromCell(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _result; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetWidth",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetFromCell",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetWidth. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetFromCell. Expected _wxHtmlSelection_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxHtmlCell_GetWidth(_arg0); + _result = (wxHtmlCell *)wxHtmlSelection_GetFromCell(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxHtmlCell_GetHeight(_swigobj) (_swigobj->GetHeight()) -static PyObject *_wrap_wxHtmlCell_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_GetToCell(_swigobj) (_swigobj->GetToCell()) +static PyObject *_wrap_wxHtmlSelection_GetToCell(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxHtmlCell * _arg0; + wxHtmlCell * _result; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetHeight",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetToCell",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetHeight. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetToCell. Expected _wxHtmlSelection_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxHtmlCell_GetHeight(_arg0); + _result = (wxHtmlCell *)wxHtmlSelection_GetToCell(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxHtmlCell_GetDescent(_swigobj) (_swigobj->GetDescent()) -static PyObject *_wrap_wxHtmlCell_GetDescent(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_GetFromPos(_swigobj) (_swigobj->GetFromPos()) +static PyObject *_wrap_wxHtmlSelection_GetFromPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxHtmlCell * _arg0; + wxPoint * _result; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetDescent",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetFromPos",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetDescent. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetFromPos. Expected _wxHtmlSelection_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxHtmlCell_GetDescent(_arg0); + const wxPoint & _result_ref = wxHtmlSelection_GetFromPos(_arg0); + _result = (wxPoint *) &_result_ref; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxHtmlCell_GetLink(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetLink(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxHtmlCell_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_GetToPos(_swigobj) (_swigobj->GetToPos()) +static PyObject *_wrap_wxHtmlSelection_GetToPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxHtmlLinkInfo * _result; - wxHtmlCell * _arg0; - int _arg1 = (int ) 0; - int _arg2 = (int ) 0; + wxPoint * _result; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","x","y", NULL }; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:wxHtmlCell_GetLink",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetToPos",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetLink. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetToPos. Expected _wxHtmlSelection_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlLinkInfo *)wxHtmlCell_GetLink(_arg0,_arg1,_arg2); + const wxPoint & _result_ref = wxHtmlSelection_GetToPos(_arg0); + _result = (wxPoint *) &_result_ref; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlLinkInfo_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -2862,33 +2955,34 @@ static PyObject *_wrap_wxHtmlCell_GetLink(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxHtmlCell_GetNext(_swigobj) (_swigobj->GetNext()) -static PyObject *_wrap_wxHtmlCell_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_GetFromPrivPos(_swigobj) (_swigobj->GetFromPrivPos()) +static PyObject *_wrap_wxHtmlSelection_GetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxHtmlCell * _result; - wxHtmlCell * _arg0; + wxPoint * _result; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetNext",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetFromPrivPos",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetNext. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetFromPrivPos. Expected _wxHtmlSelection_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlCell *)wxHtmlCell_GetNext(_arg0); + const wxPoint & _result_ref = wxHtmlSelection_GetFromPrivPos(_arg0); + _result = (wxPoint *) &_result_ref; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -2897,33 +2991,34 @@ static PyObject *_wrap_wxHtmlCell_GetNext(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxHtmlCell_GetParent(_swigobj) (_swigobj->GetParent()) -static PyObject *_wrap_wxHtmlCell_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_GetToPrivPos(_swigobj) (_swigobj->GetToPrivPos()) +static PyObject *_wrap_wxHtmlSelection_GetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxHtmlContainerCell * _result; - wxHtmlCell * _arg0; + wxPoint * _result; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetParent",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetToPrivPos",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetParent. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetToPrivPos. Expected _wxHtmlSelection_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlContainerCell *)wxHtmlCell_GetParent(_arg0); + const wxPoint & _result_ref = wxHtmlSelection_GetToPrivPos(_arg0); + _result = (wxPoint *) &_result_ref; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlContainerCell_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -2932,34 +3027,70 @@ static PyObject *_wrap_wxHtmlCell_GetParent(PyObject *self, PyObject *args, PyOb return _resultobj; } -#define wxHtmlCell_SetLink(_swigobj,_swigarg0) (_swigobj->SetLink(_swigarg0)) -static PyObject *_wrap_wxHtmlCell_SetLink(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_SetFromPrivPos(_swigobj,_swigarg0) (_swigobj->SetFromPrivPos(_swigarg0)) +static PyObject *_wrap_wxHtmlSelection_SetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxHtmlCell * _arg0; - wxHtmlLinkInfo * _arg1; + wxHtmlSelection * _arg0; + wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","link", NULL }; + wxPoint temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pos", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_SetLink",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlSelection_SetFromPrivPos",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetLink. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_SetFromPrivPos. Expected _wxHtmlSelection_p."); return NULL; } } - if (_argo1) { - if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlLinkInfo_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_SetLink. Expected _wxHtmlLinkInfo_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_SetFromPrivPos(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_SetToPrivPos(_swigobj,_swigarg0) (_swigobj->SetToPrivPos(_swigarg0)) +static PyObject *_wrap_wxHtmlSelection_SetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _arg0; + wxPoint * _arg1; + PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pos", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlSelection_SetToPrivPos",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_SetToPrivPos. Expected _wxHtmlSelection_p."); return NULL; } } +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_SetLink(_arg0,*_arg1); + wxHtmlSelection_SetToPrivPos(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2968,35 +3099,1457 @@ static PyObject *_wrap_wxHtmlCell_SetLink(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxHtmlCell_SetNext(_swigobj,_swigarg0) (_swigobj->SetNext(_swigarg0)) -static PyObject *_wrap_wxHtmlCell_SetNext(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlSelection_ClearPrivPos(_swigobj) (_swigobj->ClearPrivPos()) +static PyObject *_wrap_wxHtmlSelection_ClearPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxHtmlCell * _arg0; - wxHtmlCell * _arg1; + wxHtmlSelection * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","cell", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_SetNext",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_ClearPrivPos",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetNext. Expected _wxHtmlCell_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_ClearPrivPos. Expected _wxHtmlSelection_p."); return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_SetNext. Expected _wxHtmlCell_p."); +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_ClearPrivPos(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_IsEmpty(_swigobj) (_swigobj->IsEmpty()) +static PyObject *_wrap_wxHtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_IsEmpty",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_IsEmpty. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxHtmlSelection_IsEmpty(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define new_wxHtmlRenderingState() (new wxHtmlRenderingState()) +static PyObject *_wrap_new_wxHtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlRenderingState",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlRenderingState *)new_wxHtmlRenderingState(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingState_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxHtmlRenderingState(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxHtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxHtmlRenderingState",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxHtmlRenderingState. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxHtmlRenderingState(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_SetSelectionState(_swigobj,_swigarg0) (_swigobj->SetSelectionState(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingState_SetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + wxHtmlSelectionState _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","s", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxHtmlRenderingState_SetSelectionState",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_SetSelectionState. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState_SetSelectionState(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_GetSelectionState(_swigobj) (_swigobj->GetSelectionState()) +static PyObject *_wrap_wxHtmlRenderingState_GetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelectionState _result; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingState_GetSelectionState",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_GetSelectionState. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlSelectionState )wxHtmlRenderingState_GetSelectionState(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlRenderingState_SetFgColour(_swigobj,_swigarg0) (_swigobj->SetFgColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingState_SetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","c", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingState_SetFgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_SetFgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState_SetFgColour(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_GetFgColour(_swigobj) (_swigobj->GetFgColour()) +static PyObject *_wrap_wxHtmlRenderingState_GetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingState_GetFgColour",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_GetFgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxColour & _result_ref = wxHtmlRenderingState_GetFgColour(_arg0); + _result = (wxColour *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingState_SetBgColour(_swigobj,_swigarg0) (_swigobj->SetBgColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingState_SetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","c", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingState_SetBgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_SetBgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState_SetBgColour(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_GetBgColour(_swigobj) (_swigobj->GetBgColour()) +static PyObject *_wrap_wxHtmlRenderingState_GetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingState_GetBgColour",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_GetBgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxColour & _result_ref = wxHtmlRenderingState_GetBgColour(_arg0); + _result = (wxColour *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingStyle_GetSelectedTextColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingStyle_GetSelectedTextColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingStyle_GetSelectedTextColour. Expected _wxHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxHtmlRenderingStyle_GetSelectedTextColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxHtmlRenderingStyle_GetSelectedTextBgColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextBgColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingStyle_GetSelectedTextBgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingStyle_GetSelectedTextBgColour. Expected _wxHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxHtmlRenderingStyle_GetSelectedTextBgColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +static void *SwigwxDefaultHtmlRenderingStyleTowxHtmlRenderingStyle(void *ptr) { + wxDefaultHtmlRenderingStyle *src; + wxHtmlRenderingStyle *dest; + src = (wxDefaultHtmlRenderingStyle *) ptr; + dest = (wxHtmlRenderingStyle *) src; + return (void *) dest; +} + +#define wxDefaultHtmlRenderingStyle_GetSelectedTextColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextColour(_swigarg0)) +static PyObject *_wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxDefaultHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDefaultHtmlRenderingStyle_GetSelectedTextColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDefaultHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDefaultHtmlRenderingStyle_GetSelectedTextColour. Expected _wxDefaultHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxDefaultHtmlRenderingStyle_GetSelectedTextColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextBgColour(_swigarg0)) +static PyObject *_wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxDefaultHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDefaultHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour. Expected _wxDefaultHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define new_wxHtmlRenderingInfo() (new wxHtmlRenderingInfo()) +static PyObject *_wrap_new_wxHtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlRenderingInfo",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlRenderingInfo *)new_wxHtmlRenderingInfo(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingInfo_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxHtmlRenderingInfo(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxHtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxHtmlRenderingInfo",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxHtmlRenderingInfo. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxHtmlRenderingInfo(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingInfo_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingInfo_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _arg0; + wxHtmlSelection * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","s", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingInfo_SetSelection",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_SetSelection. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlRenderingInfo_SetSelection. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingInfo_SetSelection(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingInfo_GetSelection(_swigobj) (_swigobj->GetSelection()) +static PyObject *_wrap_wxHtmlRenderingInfo_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _result; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingInfo_GetSelection",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_GetSelection. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlSelection *)wxHtmlRenderingInfo_GetSelection(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlSelection_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingInfo_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingInfo_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _arg0; + wxHtmlRenderingStyle * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","style", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingInfo_SetStyle",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_SetStyle. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlRenderingInfo_SetStyle. Expected _wxHtmlRenderingStyle_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingInfo_SetStyle(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingInfo_GetStyle(_swigobj) (_swigobj->GetStyle()) +static PyObject *_wrap_wxHtmlRenderingInfo_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingStyle * _result; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingInfo_GetStyle",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_GetStyle. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingStyle & _result_ref = wxHtmlRenderingInfo_GetStyle(_arg0); + _result = (wxHtmlRenderingStyle *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingStyle_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingInfo_GetState(_swigobj) (_swigobj->GetState()) +static PyObject *_wrap_wxHtmlRenderingInfo_GetState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _result; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingInfo_GetState",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_GetState. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState & _result_ref = wxHtmlRenderingInfo_GetState(_arg0); + _result = (wxHtmlRenderingState *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingState_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static void *SwigwxHtmlCellTowxObject(void *ptr) { + wxHtmlCell *src; + wxObject *dest; + src = (wxHtmlCell *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxHtmlCell() (new wxHtmlCell()) +static PyObject *_wrap_new_wxHtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlCell",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlCell *)new_wxHtmlCell(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlCell_GetPosX(_swigobj) (_swigobj->GetPosX()) +static PyObject *_wrap_wxHtmlCell_GetPosX(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetPosX",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetPosX. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxHtmlCell_GetPosX(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlCell_GetPosY(_swigobj) (_swigobj->GetPosY()) +static PyObject *_wrap_wxHtmlCell_GetPosY(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetPosY",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetPosY. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxHtmlCell_GetPosY(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlCell_GetWidth(_swigobj) (_swigobj->GetWidth()) +static PyObject *_wrap_wxHtmlCell_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetWidth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetWidth. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxHtmlCell_GetWidth(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlCell_GetHeight(_swigobj) (_swigobj->GetHeight()) +static PyObject *_wrap_wxHtmlCell_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetHeight",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetHeight. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxHtmlCell_GetHeight(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlCell_GetDescent(_swigobj) (_swigobj->GetDescent()) +static PyObject *_wrap_wxHtmlCell_GetDescent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetDescent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetDescent. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxHtmlCell_GetDescent(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlCell_GetLink(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetLink(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxHtmlCell_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlLinkInfo * _result; + wxHtmlCell * _arg0; + int _arg1 = (int ) 0; + int _arg2 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:wxHtmlCell_GetLink",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetLink. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlLinkInfo *)wxHtmlCell_GetLink(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlLinkInfo_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlCell_GetNext(_swigobj) (_swigobj->GetNext()) +static PyObject *_wrap_wxHtmlCell_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetNext",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetNext. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlCell *)wxHtmlCell_GetNext(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlCell_GetParent(_swigobj) (_swigobj->GetParent()) +static PyObject *_wrap_wxHtmlCell_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlContainerCell * _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetParent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetParent. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlContainerCell *)wxHtmlCell_GetParent(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlContainerCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlCell_GetFirstChild(_swigobj) (_swigobj->GetFirstChild()) +static PyObject *_wrap_wxHtmlCell_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetFirstChild",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetFirstChild. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlCell *)wxHtmlCell_GetFirstChild(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlCell_GetCursor(_swigobj) (_swigobj->GetCursor()) +static PyObject *_wrap_wxHtmlCell_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetCursor",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetCursor. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxCursor (wxHtmlCell_GetCursor(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxCursor_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxHtmlCell_IsFormattingCell(_swigobj) (_swigobj->IsFormattingCell()) +static PyObject *_wrap_wxHtmlCell_IsFormattingCell(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_IsFormattingCell",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_IsFormattingCell. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxHtmlCell_IsFormattingCell(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlCell_SetLink(_swigobj,_swigarg0) (_swigobj->SetLink(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_SetLink(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + wxHtmlLinkInfo * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","link", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_SetLink",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetLink. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlLinkInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_SetLink. Expected _wxHtmlLinkInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlCell_SetLink(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlCell_SetNext(_swigobj,_swigarg0) (_swigobj->SetNext(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_SetNext(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + wxHtmlCell * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","cell", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_SetNext",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetNext. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_SetNext. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlCell_SetNext(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlCell_SetParent(_swigobj,_swigarg0) (_swigobj->SetParent(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + wxHtmlContainerCell * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","p", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_SetParent",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetParent. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlContainerCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_SetParent. Expected _wxHtmlContainerCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlCell_SetParent(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlCell_SetPos(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPos(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxHtmlCell_SetPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxHtmlCell_SetPos",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetPos. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlCell_SetPos(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlCell_Layout(_swigobj,_swigarg0) (_swigobj->Layout(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_Layout(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","w", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxHtmlCell_Layout",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_Layout. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlCell_Layout(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlCell_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxHtmlCell_Draw(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + wxDC * _arg1; + int _arg2; + int _arg3; + int _arg4; + int _arg5; + wxHtmlRenderingInfo * _arg6; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo6 = 0; + char *_kwnames[] = { "self","dc","x","y","view_y1","view_y2","info", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOiiiiO:wxHtmlCell_Draw",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_Draw. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_Draw. Expected _wxDC_p."); + return NULL; + } + } + if (_argo6) { + if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxHtmlCell_Draw. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlCell_Draw(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,*_arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlCell_DrawInvisible(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawInvisible(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxHtmlCell_DrawInvisible(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + wxDC * _arg1; + int _arg2; + int _arg3; + wxHtmlRenderingInfo * _arg4; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo4 = 0; + char *_kwnames[] = { "self","dc","x","y","info", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOiiO:wxHtmlCell_DrawInvisible",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_argo4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_DrawInvisible. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_DrawInvisible. Expected _wxDC_p."); + return NULL; + } + } + if (_argo4) { + if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxHtmlCell_DrawInvisible. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlCell_DrawInvisible(_arg0,*_arg1,_arg2,_arg3,*_arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlCell_Find(_swigobj,_swigarg0,_swigarg1) (_swigobj->Find(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxHtmlCell_Find(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _result; + wxHtmlCell * _arg0; + int _arg1; + void * _arg2; + PyObject * _argo0 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","condition","param", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxHtmlCell_Find",_kwnames,&_argo0,&_arg1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_Find. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,(char *) 0 )) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxHtmlCell_Find. Expected _void_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlCell *)wxHtmlCell_Find(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlCell_AdjustPagebreak(_swigobj,_swigarg0) (_swigobj->AdjustPagebreak(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_AdjustPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxHtmlCell * _arg0; + int * _arg1; + PyObject * _argo0 = 0; + int temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","INOUT", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_AdjustPagebreak",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_AdjustPagebreak. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + temp = (int) PyInt_AsLong(_obj1); + _arg1 = &temp; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxHtmlCell_AdjustPagebreak(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxHtmlCell_SetCanLiveOnPagebreak(_swigobj,_swigarg0) (_swigobj->SetCanLiveOnPagebreak(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","can", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxHtmlCell_SetCanLiveOnPagebreak",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetCanLiveOnPagebreak. Expected _wxHtmlCell_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_SetNext(_arg0,_arg1); + wxHtmlCell_SetCanLiveOnPagebreak(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3005,212 +4558,187 @@ static PyObject *_wrap_wxHtmlCell_SetNext(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxHtmlCell_SetParent(_swigobj,_swigarg0) (_swigobj->SetParent(_swigarg0)) -static PyObject *_wrap_wxHtmlCell_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_IsLinebreakAllowed(_swigobj) (_swigobj->IsLinebreakAllowed()) +static PyObject *_wrap_wxHtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + bool _result; wxHtmlCell * _arg0; - wxHtmlContainerCell * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","p", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_SetParent",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_IsLinebreakAllowed",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetParent. Expected _wxHtmlCell_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlContainerCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_SetParent. Expected _wxHtmlContainerCell_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_IsLinebreakAllowed. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_SetParent(_arg0,_arg1); + _result = (bool )wxHtmlCell_IsLinebreakAllowed(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxHtmlCell_SetPos(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPos(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxHtmlCell_SetPos(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_IsTerminalCell(_swigobj) (_swigobj->IsTerminalCell()) +static PyObject *_wrap_wxHtmlCell_IsTerminalCell(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + bool _result; wxHtmlCell * _arg0; - int _arg1; - int _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","x","y", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxHtmlCell_SetPos",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_IsTerminalCell",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetPos. Expected _wxHtmlCell_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_IsTerminalCell. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_SetPos(_arg0,_arg1,_arg2); + _result = (bool )wxHtmlCell_IsTerminalCell(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxHtmlCell_Layout(_swigobj,_swigarg0) (_swigobj->Layout(_swigarg0)) -static PyObject *_wrap_wxHtmlCell_Layout(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_FindCellByPos(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->FindCellByPos(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxHtmlCell_FindCellByPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxHtmlCell * _result; wxHtmlCell * _arg0; - int _arg1; + wxCoord _arg1; + wxCoord _arg2; + unsigned _arg3 = (unsigned ) (wxHTML_FIND_EXACT); PyObject * _argo0 = 0; - char *_kwnames[] = { "self","w", NULL }; + char *_kwnames[] = { "self","x","y","flags", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxHtmlCell_Layout",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|i:wxHtmlCell_FindCellByPos",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_Layout. Expected _wxHtmlCell_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_FindCellByPos. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_Layout(_arg0,_arg1); + _result = (wxHtmlCell *)wxHtmlCell_FindCellByPos(_arg0,_arg1,_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxHtmlCell_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) -static PyObject *_wrap_wxHtmlCell_Draw(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_GetAbsPos(_swigobj) (_swigobj->GetAbsPos()) +static PyObject *_wrap_wxHtmlCell_GetAbsPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxPoint * _result; wxHtmlCell * _arg0; - wxDC * _arg1; - int _arg2; - int _arg3; - int _arg4; - int _arg5; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","dc","x","y","view_y1","view_y2", NULL }; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOiiii:wxHtmlCell_Draw",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetAbsPos",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_Draw. Expected _wxHtmlCell_p."); - return NULL; - } - } - if (_argo1) { - if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_Draw. Expected _wxDC_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetAbsPos. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_Draw(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5); + _result = new wxPoint (wxHtmlCell_GetAbsPos(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxHtmlCell_DrawInvisible(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DrawInvisible(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxHtmlCell_DrawInvisible(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_GetFirstTerminal(_swigobj) (_swigobj->GetFirstTerminal()) +static PyObject *_wrap_wxHtmlCell_GetFirstTerminal(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxHtmlCell * _result; wxHtmlCell * _arg0; - wxDC * _arg1; - int _arg2; - int _arg3; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","dc","x","y", NULL }; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxHtmlCell_DrawInvisible",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetFirstTerminal",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_DrawInvisible. Expected _wxHtmlCell_p."); - return NULL; - } - } - if (_argo1) { - if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_DrawInvisible. Expected _wxDC_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetFirstTerminal. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_DrawInvisible(_arg0,*_arg1,_arg2,_arg3); + _result = (wxHtmlCell *)wxHtmlCell_GetFirstTerminal(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxHtmlCell_Find(_swigobj,_swigarg0,_swigarg1) (_swigobj->Find(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxHtmlCell_Find(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_GetLastTerminal(_swigobj) (_swigobj->GetLastTerminal()) +static PyObject *_wrap_wxHtmlCell_GetLastTerminal(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxHtmlCell * _result; wxHtmlCell * _arg0; - int _arg1; - void * _arg2; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","condition","param", NULL }; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxHtmlCell_Find",_kwnames,&_argo0,&_arg1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetLastTerminal",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_Find. Expected _wxHtmlCell_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,(char *) 0 )) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxHtmlCell_Find. Expected _void_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetLastTerminal. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlCell *)wxHtmlCell_Find(_arg0,_arg1,_arg2); + _result = (wxHtmlCell *)wxHtmlCell_GetLastTerminal(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3224,36 +4752,64 @@ static PyObject *_wrap_wxHtmlCell_Find(PyObject *self, PyObject *args, PyObject return _resultobj; } -#define wxHtmlCell_AdjustPagebreak(_swigobj,_swigarg0) (_swigobj->AdjustPagebreak(_swigarg0)) -static PyObject *_wrap_wxHtmlCell_AdjustPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_GetDepth(_swigobj) (_swigobj->GetDepth()) +static PyObject *_wrap_wxHtmlCell_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + unsigned _result; + wxHtmlCell * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetDepth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetDepth. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (unsigned )wxHtmlCell_GetDepth(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlCell_IsBefore(_swigobj,_swigarg0) (_swigobj->IsBefore(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_IsBefore(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxHtmlCell * _arg0; - int * _arg1; + wxHtmlCell * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "self","pagebreak", NULL }; + char *_kwnames[] = { "self","cell", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_AdjustPagebreak",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_IsBefore",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_AdjustPagebreak. Expected _wxHtmlCell_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_IsBefore. Expected _wxHtmlCell_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_int_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_AdjustPagebreak. Expected _int_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_IsBefore. Expected _wxHtmlCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxHtmlCell_AdjustPagebreak(_arg0,_arg1); + _result = (bool )wxHtmlCell_IsBefore(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3261,34 +4817,49 @@ static PyObject *_wrap_wxHtmlCell_AdjustPagebreak(PyObject *self, PyObject *args return _resultobj; } -#define wxHtmlCell_SetCanLiveOnPagebreak(_swigobj,_swigarg0) (_swigobj->SetCanLiveOnPagebreak(_swigarg0)) -static PyObject *_wrap_wxHtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlCell_ConvertToText(_swigobj,_swigarg0) (_swigobj->ConvertToText(_swigarg0)) +static PyObject *_wrap_wxHtmlCell_ConvertToText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxString * _result; wxHtmlCell * _arg0; - bool _arg1; + wxHtmlSelection * _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","can", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","sel", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxHtmlCell_SetCanLiveOnPagebreak",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_ConvertToText",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetCanLiveOnPagebreak. Expected _wxHtmlCell_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_ConvertToText. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlCell_ConvertToText. Expected _wxHtmlSelection_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_SetCanLiveOnPagebreak(_arg0,_arg1); + _result = new wxString (wxHtmlCell_ConvertToText(_arg0,_arg1)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + delete _result; +} return _resultobj; } @@ -3886,8 +5457,8 @@ static PyObject *_wrap_wxHtmlContainerCell_SetBorder(PyObject *self, PyObject *a return _resultobj; } -#define wxHtmlContainerCell_GetFirstCell(_swigobj) (_swigobj->GetFirstCell()) -static PyObject *_wrap_wxHtmlContainerCell_GetFirstCell(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlContainerCell_GetFirstChild(_swigobj) (_swigobj->GetFirstChild()) +static PyObject *_wrap_wxHtmlContainerCell_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxHtmlCell * _result; wxHtmlContainerCell * _arg0; @@ -3896,18 +5467,18 @@ static PyObject *_wrap_wxHtmlContainerCell_GetFirstCell(PyObject *self, PyObject char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlContainerCell_GetFirstCell",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlContainerCell_GetFirstChild",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlContainerCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlContainerCell_GetFirstCell. Expected _wxHtmlContainerCell_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlContainerCell_GetFirstChild. Expected _wxHtmlContainerCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlCell *)wxHtmlContainerCell_GetFirstCell(_arg0); + _result = (wxHtmlCell *)wxHtmlContainerCell_GetFirstChild(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4195,7 +5766,7 @@ static PyObject *_wrap_new_wxHtmlWindow(PyObject *self, PyObject *args, PyObject int _arg1 = (int ) -1; wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; wxSize * _arg3 = (wxSize *) &wxDefaultSize; - int _arg4 = (int ) (wxHW_SCROLLBAR_AUTO); + int _arg4 = (int ) (wxHW_DEFAULT_STYLE); wxString * _arg5 = (wxString *) &wxPyHtmlWindowNameStr; PyObject * _argo0 = 0; wxPoint temp; @@ -4465,6 +6036,45 @@ static PyObject *_wrap_wxHtmlWindow_LoadPage(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxHtmlWindow_LoadFile(_swigobj,_swigarg0) (_swigobj->LoadFile(_swigarg0)) +static PyObject *_wrap_wxHtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPyHtmlWindow * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","filename", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlWindow_LoadFile",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyHtmlWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlWindow_LoadFile. Expected _wxPyHtmlWindow_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxHtmlWindow_LoadFile(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxHtmlWindow_AppendToPage(_swigobj,_swigarg0) (_swigobj->AppendToPage(_swigarg0)) static PyObject *_wrap_wxHtmlWindow_AppendToPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5670,7 +7280,7 @@ static PyObject *_wrap_wxHtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, return _resultobj; } -#define wxHtmlDCRenderer_Render(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->Render(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +#define wxHtmlDCRenderer_Render(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (_swigobj->Render(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) static PyObject *_wrap_wxHtmlDCRenderer_Render(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; @@ -5679,11 +7289,15 @@ static PyObject *_wrap_wxHtmlDCRenderer_Render(PyObject *self, PyObject *args, P int _arg2; int _arg3 = (int ) 0; int _arg4 = (int ) FALSE; + int _arg5 = (int ) INT_MAX; + int * _arg6 = (int *) NULL; + int _arg7 = (int ) 0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","x","y","from","dont_render", NULL }; + PyObject * _obj6 = 0; + char *_kwnames[] = { "self","x","y","from","dont_render","to","choices", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|ii:wxHtmlDCRenderer_Render",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|iiiO:wxHtmlDCRenderer_Render",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5692,13 +7306,31 @@ static PyObject *_wrap_wxHtmlDCRenderer_Render(PyObject *self, PyObject *args, P return NULL; } } + if (_obj6) +{ + _arg6 = int_LIST_helper(_obj6); + if (_arg6 == NULL) { + return NULL; + } +} +{ + if (_obj6) { + _arg7 = PyList_Size(_obj6); + } + else { + _arg7 = 0; + } +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxHtmlDCRenderer_Render(_arg0,_arg1,_arg2,_arg3,_arg4); + _result = (int )wxHtmlDCRenderer_Render(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); +{ + delete [] _arg6; +} return _resultobj; } @@ -6052,6 +7684,51 @@ static PyObject *_wrap_wxHtmlPrintout_SetMargins(PyObject *self, PyObject *args, return _resultobj; } +static PyObject *_wrap_wxHtmlPrintout_AddFilter(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlFilter * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "filter", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlPrintout_AddFilter",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlFilter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlPrintout_AddFilter. Expected _wxHtmlFilter_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlPrintout::AddFilter(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxHtmlPrintout_CleanUpStatics(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxHtmlPrintout_CleanUpStatics",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlPrintout::CleanUpStatics(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxHtmlEasyPrintingTowxObject(void *ptr) { wxHtmlEasyPrinting *src; wxObject *dest; @@ -6065,10 +7742,10 @@ static PyObject *_wrap_new_wxHtmlEasyPrinting(PyObject *self, PyObject *args, Py PyObject * _resultobj; wxHtmlEasyPrinting * _result; wxString * _arg0 = (wxString *) &wxPyHtmlPrintingTitleStr; - wxFrame * _arg1 = (wxFrame *) NULL; + wxWindow * _arg1 = (wxWindow *) NULL; PyObject * _obj0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "name","parent_frame", NULL }; + char *_kwnames[] = { "name","parentWindow", NULL }; char _ptemp[128]; self = self; @@ -6082,8 +7759,8 @@ static PyObject *_wrap_new_wxHtmlEasyPrinting(PyObject *self, PyObject *args, Py } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxHtmlEasyPrinting. Expected _wxFrame_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxHtmlEasyPrinting. Expected _wxWindow_p."); return NULL; } } @@ -6597,6 +8274,8 @@ static PyMethodDef htmlcMethods[] = { { "wxHtmlEasyPrinting_PreviewFile", (PyCFunction) _wrap_wxHtmlEasyPrinting_PreviewFile, METH_VARARGS | METH_KEYWORDS }, { "delete_wxHtmlEasyPrinting", (PyCFunction) _wrap_delete_wxHtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlEasyPrinting", (PyCFunction) _wrap_new_wxHtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlPrintout_CleanUpStatics", (PyCFunction) _wrap_wxHtmlPrintout_CleanUpStatics, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlPrintout_AddFilter", (PyCFunction) _wrap_wxHtmlPrintout_AddFilter, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlPrintout_SetMargins", (PyCFunction) _wrap_wxHtmlPrintout_SetMargins, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlPrintout_SetFonts", (PyCFunction) _wrap_wxHtmlPrintout_SetFonts, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlPrintout_SetFooter", (PyCFunction) _wrap_wxHtmlPrintout_SetFooter, METH_VARARGS | METH_KEYWORDS }, @@ -6638,6 +8317,7 @@ static PyMethodDef htmlcMethods[] = { { "wxHtmlWindow_GetOpenedAnchor", (PyCFunction) _wrap_wxHtmlWindow_GetOpenedAnchor, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWindow_GetOpenedPage", (PyCFunction) _wrap_wxHtmlWindow_GetOpenedPage, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWindow_AppendToPage", (PyCFunction) _wrap_wxHtmlWindow_AppendToPage, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlWindow_LoadFile", (PyCFunction) _wrap_wxHtmlWindow_LoadFile, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWindow_LoadPage", (PyCFunction) _wrap_wxHtmlWindow_LoadPage, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWindow_SetPage", (PyCFunction) _wrap_wxHtmlWindow_SetPage, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWindow__setCallbackInfo", (PyCFunction) _wrap_wxHtmlWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, @@ -6649,7 +8329,7 @@ static PyMethodDef htmlcMethods[] = { { "new_wxHtmlWidgetCell", (PyCFunction) _wrap_new_wxHtmlWidgetCell, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlFontCell", (PyCFunction) _wrap_new_wxHtmlFontCell, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlColourCell", (PyCFunction) _wrap_new_wxHtmlColourCell, METH_VARARGS | METH_KEYWORDS }, - { "wxHtmlContainerCell_GetFirstCell", (PyCFunction) _wrap_wxHtmlContainerCell_GetFirstCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlContainerCell_GetFirstChild", (PyCFunction) _wrap_wxHtmlContainerCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetBorder", (PyCFunction) _wrap_wxHtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_GetBackgroundColour", (PyCFunction) _wrap_wxHtmlContainerCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_wxHtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, @@ -6667,6 +8347,15 @@ static PyMethodDef htmlcMethods[] = { { "wxHtmlContainerCell_InsertCell", (PyCFunction) _wrap_wxHtmlContainerCell_InsertCell, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlContainerCell", (PyCFunction) _wrap_new_wxHtmlContainerCell, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlWordCell", (PyCFunction) _wrap_new_wxHtmlWordCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_ConvertToText", (PyCFunction) _wrap_wxHtmlCell_ConvertToText, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_IsBefore", (PyCFunction) _wrap_wxHtmlCell_IsBefore, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_GetDepth", (PyCFunction) _wrap_wxHtmlCell_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_GetLastTerminal", (PyCFunction) _wrap_wxHtmlCell_GetLastTerminal, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_GetFirstTerminal", (PyCFunction) _wrap_wxHtmlCell_GetFirstTerminal, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_GetAbsPos", (PyCFunction) _wrap_wxHtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_FindCellByPos", (PyCFunction) _wrap_wxHtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_IsTerminalCell", (PyCFunction) _wrap_wxHtmlCell_IsTerminalCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_IsLinebreakAllowed", (PyCFunction) _wrap_wxHtmlCell_IsLinebreakAllowed, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_wxHtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_AdjustPagebreak", (PyCFunction) _wrap_wxHtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_Find", (PyCFunction) _wrap_wxHtmlCell_Find, METH_VARARGS | METH_KEYWORDS }, @@ -6677,6 +8366,9 @@ static PyMethodDef htmlcMethods[] = { { "wxHtmlCell_SetParent", (PyCFunction) _wrap_wxHtmlCell_SetParent, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_SetNext", (PyCFunction) _wrap_wxHtmlCell_SetNext, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_SetLink", (PyCFunction) _wrap_wxHtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_IsFormattingCell", (PyCFunction) _wrap_wxHtmlCell_IsFormattingCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_GetCursor", (PyCFunction) _wrap_wxHtmlCell_GetCursor, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlCell_GetFirstChild", (PyCFunction) _wrap_wxHtmlCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_GetParent", (PyCFunction) _wrap_wxHtmlCell_GetParent, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_GetNext", (PyCFunction) _wrap_wxHtmlCell_GetNext, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_GetLink", (PyCFunction) _wrap_wxHtmlCell_GetLink, METH_VARARGS | METH_KEYWORDS }, @@ -6686,6 +8378,39 @@ static PyMethodDef htmlcMethods[] = { { "wxHtmlCell_GetPosY", (PyCFunction) _wrap_wxHtmlCell_GetPosY, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_GetPosX", (PyCFunction) _wrap_wxHtmlCell_GetPosX, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlCell", (PyCFunction) _wrap_new_wxHtmlCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_GetState", (PyCFunction) _wrap_wxHtmlRenderingInfo_GetState, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_GetStyle", (PyCFunction) _wrap_wxHtmlRenderingInfo_GetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_SetStyle", (PyCFunction) _wrap_wxHtmlRenderingInfo_SetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_GetSelection", (PyCFunction) _wrap_wxHtmlRenderingInfo_GetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_SetSelection", (PyCFunction) _wrap_wxHtmlRenderingInfo_SetSelection, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxHtmlRenderingInfo", (PyCFunction) _wrap_delete_wxHtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS }, + { "new_wxHtmlRenderingInfo", (PyCFunction) _wrap_new_wxHtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS }, + { "wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxDefaultHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_wxHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_wxHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_GetBgColour", (PyCFunction) _wrap_wxHtmlRenderingState_GetBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_SetBgColour", (PyCFunction) _wrap_wxHtmlRenderingState_SetBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_GetFgColour", (PyCFunction) _wrap_wxHtmlRenderingState_GetFgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_SetFgColour", (PyCFunction) _wrap_wxHtmlRenderingState_SetFgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_GetSelectionState", (PyCFunction) _wrap_wxHtmlRenderingState_GetSelectionState, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_SetSelectionState", (PyCFunction) _wrap_wxHtmlRenderingState_SetSelectionState, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxHtmlRenderingState", (PyCFunction) _wrap_delete_wxHtmlRenderingState, METH_VARARGS | METH_KEYWORDS }, + { "new_wxHtmlRenderingState", (PyCFunction) _wrap_new_wxHtmlRenderingState, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_IsEmpty", (PyCFunction) _wrap_wxHtmlSelection_IsEmpty, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_ClearPrivPos", (PyCFunction) _wrap_wxHtmlSelection_ClearPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_SetToPrivPos", (PyCFunction) _wrap_wxHtmlSelection_SetToPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_SetFromPrivPos", (PyCFunction) _wrap_wxHtmlSelection_SetFromPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetToPrivPos", (PyCFunction) _wrap_wxHtmlSelection_GetToPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetFromPrivPos", (PyCFunction) _wrap_wxHtmlSelection_GetFromPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetToPos", (PyCFunction) _wrap_wxHtmlSelection_GetToPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetFromPos", (PyCFunction) _wrap_wxHtmlSelection_GetFromPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetToCell", (PyCFunction) _wrap_wxHtmlSelection_GetToCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetFromCell", (PyCFunction) _wrap_wxHtmlSelection_GetFromCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_SetCells", (PyCFunction) _wrap_wxHtmlSelection_SetCells, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_Set", (PyCFunction) _wrap_wxHtmlSelection_Set, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxHtmlSelection", (PyCFunction) _wrap_delete_wxHtmlSelection, METH_VARARGS | METH_KEYWORDS }, + { "new_wxHtmlSelection", (PyCFunction) _wrap_new_wxHtmlSelection, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWinTagHandler_ParseInner", (PyCFunction) _wrap_wxHtmlWinTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWinTagHandler_GetParser", (PyCFunction) _wrap_wxHtmlWinTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWinTagHandler_SetParser", (PyCFunction) _wrap_wxHtmlWinTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS }, @@ -6798,6 +8523,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxHtmlCell","_wxHtmlContainerCell",SwigwxHtmlContainerCellTowxHtmlCell}, { "_wxHtmlCell","_wxHtmlWordCell",SwigwxHtmlWordCellTowxHtmlCell}, { "_char","_wxChar",0}, + { "_wxHtmlRenderingStyle","_wxDefaultHtmlRenderingStyle",SwigwxDefaultHtmlRenderingStyleTowxHtmlRenderingStyle}, { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_wxPyHtmlTagHandler","_wxPyHtmlWinTagHandler",SwigwxPyHtmlWinTagHandlerTowxPyHtmlTagHandler}, { "_EBool","_wxCoord",0}, @@ -6923,12 +8649,20 @@ SWIGEXPORT(void) inithtmlc() { PyDict_SetItemString(d,"wxHTML_COND_USER", PyInt_FromLong((long) wxHTML_COND_USER)); PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER)); PyDict_SetItemString(d,"wxHW_SCROLLBAR_AUTO", PyInt_FromLong((long) wxHW_SCROLLBAR_AUTO)); + PyDict_SetItemString(d,"wxHW_NO_SELECTION", PyInt_FromLong((long) wxHW_NO_SELECTION)); + PyDict_SetItemString(d,"wxHW_DEFAULT_STYLE", PyInt_FromLong((long) wxHW_DEFAULT_STYLE)); PyDict_SetItemString(d,"wxHTML_OPEN", PyInt_FromLong((long) wxHTML_OPEN)); PyDict_SetItemString(d,"wxHTML_BLOCK", PyInt_FromLong((long) wxHTML_BLOCK)); PyDict_SetItemString(d,"wxHTML_REDIRECT", PyInt_FromLong((long) wxHTML_REDIRECT)); PyDict_SetItemString(d,"wxHTML_URL_PAGE", PyInt_FromLong((long) wxHTML_URL_PAGE)); PyDict_SetItemString(d,"wxHTML_URL_IMAGE", PyInt_FromLong((long) wxHTML_URL_IMAGE)); PyDict_SetItemString(d,"wxHTML_URL_OTHER", PyInt_FromLong((long) wxHTML_URL_OTHER)); + PyDict_SetItemString(d,"wxHTML_SEL_OUT", PyInt_FromLong((long) wxHTML_SEL_OUT)); + PyDict_SetItemString(d,"wxHTML_SEL_IN", PyInt_FromLong((long) wxHTML_SEL_IN)); + PyDict_SetItemString(d,"wxHTML_SEL_CHANGING", PyInt_FromLong((long) wxHTML_SEL_CHANGING)); + PyDict_SetItemString(d,"wxHTML_FIND_EXACT", PyInt_FromLong((long) wxHTML_FIND_EXACT)); + PyDict_SetItemString(d,"wxHTML_FIND_NEAREST_BEFORE", PyInt_FromLong((long) wxHTML_FIND_NEAREST_BEFORE)); + PyDict_SetItemString(d,"wxHTML_FIND_NEAREST_AFTER", PyInt_FromLong((long) wxHTML_FIND_NEAREST_AFTER)); PyDict_SetItemString(d,"wxPAGE_ODD", PyInt_FromLong((long) wxPAGE_ODD)); PyDict_SetItemString(d,"wxPAGE_EVEN", PyInt_FromLong((long) wxPAGE_EVEN)); PyDict_SetItemString(d,"wxPAGE_ALL", PyInt_FromLong((long) wxPAGE_ALL)); diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py index 58e15a4d99..a846e9e5b1 100644 --- a/wxPython/src/msw/html.py +++ b/wxPython/src/msw/html.py @@ -48,29 +48,29 @@ class wxHtmlLinkInfoPtr(wxObjectPtr): self.this = this self.thisown = 0 def GetHref(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlLinkInfo_GetHref,(self,) + _args, _kwargs) + val = htmlc.wxHtmlLinkInfo_GetHref(self, *_args, **_kwargs) return val def GetTarget(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlLinkInfo_GetTarget,(self,) + _args, _kwargs) + val = htmlc.wxHtmlLinkInfo_GetTarget(self, *_args, **_kwargs) return val def GetEvent(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlLinkInfo_GetEvent,(self,) + _args, _kwargs) + val = htmlc.wxHtmlLinkInfo_GetEvent(self, *_args, **_kwargs) return val def GetHtmlCell(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlLinkInfo_GetHtmlCell,(self,) + _args, _kwargs) + val = htmlc.wxHtmlLinkInfo_GetHtmlCell(self, *_args, **_kwargs) if val: val = wxHtmlCellPtr(val) return val def SetEvent(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlLinkInfo_SetEvent,(self,) + _args, _kwargs) + val = htmlc.wxHtmlLinkInfo_SetEvent(self, *_args, **_kwargs) return val def SetHtmlCell(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlLinkInfo_SetHtmlCell,(self,) + _args, _kwargs) + val = htmlc.wxHtmlLinkInfo_SetHtmlCell(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlLinkInfo(wxHtmlLinkInfoPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlLinkInfo,_args,_kwargs) + self.this = htmlc.new_wxHtmlLinkInfo(*_args,**_kwargs) self.thisown = 1 @@ -81,31 +81,31 @@ class wxHtmlTagPtr(wxObjectPtr): self.this = this self.thisown = 0 def GetName(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_GetName,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_GetName(self, *_args, **_kwargs) return val def HasParam(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_HasParam,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_HasParam(self, *_args, **_kwargs) return val def GetParam(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_GetParam,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_GetParam(self, *_args, **_kwargs) return val def GetAllParams(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_GetAllParams,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_GetAllParams(self, *_args, **_kwargs) return val def HasEnding(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_HasEnding,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_HasEnding(self, *_args, **_kwargs) return val def GetBeginPos(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_GetBeginPos,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_GetBeginPos(self, *_args, **_kwargs) return val def GetEndPos1(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_GetEndPos1,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_GetEndPos1(self, *_args, **_kwargs) return val def GetEndPos2(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTag_GetEndPos2,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTag_GetEndPos2(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlTag instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlTag(wxHtmlTagPtr): def __init__(self,this): self.this = this @@ -118,40 +118,40 @@ class wxHtmlParserPtr(wxObjectPtr): self.this = this self.thisown = 0 def SetFS(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_SetFS,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_SetFS(self, *_args, **_kwargs) return val def GetFS(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_GetFS,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_GetFS(self, *_args, **_kwargs) return val def Parse(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_Parse,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_Parse(self, *_args, **_kwargs) return val def InitParser(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_InitParser,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_InitParser(self, *_args, **_kwargs) return val def DoneParser(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_DoneParser,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_DoneParser(self, *_args, **_kwargs) return val def DoParsing(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_DoParsing,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_DoParsing(self, *_args, **_kwargs) return val def StopParsing(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_StopParsing,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_StopParsing(self, *_args, **_kwargs) return val def AddTagHandler(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_AddTagHandler,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_AddTagHandler(self, *_args, **_kwargs) return val def GetSource(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_GetSource,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_GetSource(self, *_args, **_kwargs) return val def PushTagHandler(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_PushTagHandler,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_PushTagHandler(self, *_args, **_kwargs) return val def PopTagHandler(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlParser_PopTagHandler,(self,) + _args, _kwargs) + val = htmlc.wxHtmlParser_PopTagHandler(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlParser(wxHtmlParserPtr): def __init__(self,this): self.this = this @@ -164,105 +164,105 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr): self.this = this self.thisown = 0 def SetDC(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetDC,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetDC(self, *_args, **_kwargs) return val def GetDC(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetDC,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetDC(self, *_args, **_kwargs) return val def GetCharHeight(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetCharHeight,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetCharHeight(self, *_args, **_kwargs) return val def GetCharWidth(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetCharWidth,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetCharWidth(self, *_args, **_kwargs) return val def GetWindow(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetWindow,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetWindow(self, *_args, **_kwargs) return val def SetFonts(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetFonts,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetFonts(self, *_args, **_kwargs) return val def GetContainer(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetContainer,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetContainer(self, *_args, **_kwargs) if val: val = wxHtmlContainerCellPtr(val) return val def OpenContainer(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_OpenContainer,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_OpenContainer(self, *_args, **_kwargs) if val: val = wxHtmlContainerCellPtr(val) return val def SetContainer(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetContainer,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetContainer(self, *_args, **_kwargs) if val: val = wxHtmlContainerCellPtr(val) return val def CloseContainer(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_CloseContainer,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_CloseContainer(self, *_args, **_kwargs) if val: val = wxHtmlContainerCellPtr(val) return val def GetFontSize(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetFontSize,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetFontSize(self, *_args, **_kwargs) return val def SetFontSize(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetFontSize,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetFontSize(self, *_args, **_kwargs) return val def GetFontBold(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetFontBold,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetFontBold(self, *_args, **_kwargs) return val def SetFontBold(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetFontBold,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetFontBold(self, *_args, **_kwargs) return val def GetFontItalic(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetFontItalic,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetFontItalic(self, *_args, **_kwargs) return val def SetFontItalic(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetFontItalic,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetFontItalic(self, *_args, **_kwargs) return val def GetFontUnderlined(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetFontUnderlined,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetFontUnderlined(self, *_args, **_kwargs) return val def SetFontUnderlined(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetFontUnderlined,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetFontUnderlined(self, *_args, **_kwargs) return val def GetFontFixed(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetFontFixed,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetFontFixed(self, *_args, **_kwargs) return val def SetFontFixed(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetFontFixed,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetFontFixed(self, *_args, **_kwargs) return val def GetAlign(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetAlign,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetAlign(self, *_args, **_kwargs) return val def SetAlign(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetAlign,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetAlign(self, *_args, **_kwargs) return val def GetLinkColor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetLinkColor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetLinkColor(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetLinkColor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetLinkColor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetLinkColor(self, *_args, **_kwargs) return val def GetActualColor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetActualColor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetActualColor(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetActualColor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetActualColor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetActualColor(self, *_args, **_kwargs) return val def SetLink(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_SetLink,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_SetLink(self, *_args, **_kwargs) return val def CreateCurrentFont(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_CreateCurrentFont,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_CreateCurrentFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) return val def GetLink(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinParser_GetLink,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinParser_GetLink(self, *_args, **_kwargs) if val: val = wxHtmlLinkInfoPtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlWinParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlWinParser(wxHtmlWinParserPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlWinParser,_args,_kwargs) + self.this = htmlc.new_wxHtmlWinParser(*_args,**_kwargs) self.thisown = 1 @@ -273,23 +273,23 @@ class wxHtmlTagHandlerPtr(wxObjectPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTagHandler__setCallbackInfo,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTagHandler__setCallbackInfo(self, *_args, **_kwargs) return val def SetParser(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTagHandler_SetParser,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTagHandler_SetParser(self, *_args, **_kwargs) return val def GetParser(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTagHandler_GetParser,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTagHandler_GetParser(self, *_args, **_kwargs) if val: val = wxHtmlParserPtr(val) return val def ParseInner(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlTagHandler_ParseInner,(self,) + _args, _kwargs) + val = htmlc.wxHtmlTagHandler_ParseInner(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlTagHandler(wxHtmlTagHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlTagHandler,_args,_kwargs) + self.this = htmlc.new_wxHtmlTagHandler(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxHtmlTagHandler) @@ -301,96 +301,320 @@ class wxHtmlWinTagHandlerPtr(wxHtmlTagHandlerPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinTagHandler__setCallbackInfo,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinTagHandler__setCallbackInfo(self, *_args, **_kwargs) return val def SetParser(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinTagHandler_SetParser,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinTagHandler_SetParser(self, *_args, **_kwargs) return val def GetParser(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinTagHandler_GetParser,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinTagHandler_GetParser(self, *_args, **_kwargs) if val: val = wxHtmlWinParserPtr(val) return val def ParseInner(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWinTagHandler_ParseInner,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWinTagHandler_ParseInner(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlWinTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlWinTagHandler(wxHtmlWinTagHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlWinTagHandler,_args,_kwargs) + self.this = htmlc.new_wxHtmlWinTagHandler(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxHtmlWinTagHandler) +class wxHtmlSelectionPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=htmlc.delete_wxHtmlSelection): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def Set(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_Set(self, *_args, **_kwargs) + return val + def SetCells(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_SetCells(self, *_args, **_kwargs) + return val + def GetFromCell(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetFromCell(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetToCell(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetToCell(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetFromPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetFromPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def GetToPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetToPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def GetFromPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetFromPrivPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def GetToPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetToPrivPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def SetFromPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_SetFromPrivPos(self, *_args, **_kwargs) + return val + def SetToPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_SetToPrivPos(self, *_args, **_kwargs) + return val + def ClearPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_ClearPrivPos(self, *_args, **_kwargs) + return val + def IsEmpty(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_IsEmpty(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlSelection instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlSelection(wxHtmlSelectionPtr): + def __init__(self,*_args,**_kwargs): + self.this = htmlc.new_wxHtmlSelection(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxHtmlRenderingStatePtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=htmlc.delete_wxHtmlRenderingState): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def SetSelectionState(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_SetSelectionState(self, *_args, **_kwargs) + return val + def GetSelectionState(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_GetSelectionState(self, *_args, **_kwargs) + return val + def SetFgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_SetFgColour(self, *_args, **_kwargs) + return val + def GetFgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_GetFgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) + return val + def SetBgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_SetBgColour(self, *_args, **_kwargs) + return val + def GetBgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_GetBgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlRenderingState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlRenderingState(wxHtmlRenderingStatePtr): + def __init__(self,*_args,**_kwargs): + self.this = htmlc.new_wxHtmlRenderingState(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxHtmlRenderingStylePtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSelectedTextColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingStyle_GetSelectedTextColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def GetSelectedTextBgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingStyle_GetSelectedTextBgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlRenderingStyle(wxHtmlRenderingStylePtr): + def __init__(self,this): + self.this = this + + + + +class wxDefaultHtmlRenderingStylePtr(wxHtmlRenderingStylePtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSelectedTextColour(self, *_args, **_kwargs): + val = htmlc.wxDefaultHtmlRenderingStyle_GetSelectedTextColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def GetSelectedTextBgColour(self, *_args, **_kwargs): + val = htmlc.wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxDefaultHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxDefaultHtmlRenderingStyle(wxDefaultHtmlRenderingStylePtr): + def __init__(self,this): + self.this = this + + + + +class wxHtmlRenderingInfoPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=htmlc.delete_wxHtmlRenderingInfo): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def SetSelection(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_SetSelection(self, *_args, **_kwargs) + return val + def GetSelection(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_GetSelection(self, *_args, **_kwargs) + if val: val = wxHtmlSelectionPtr(val) + return val + def SetStyle(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_SetStyle(self, *_args, **_kwargs) + return val + def GetStyle(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_GetStyle(self, *_args, **_kwargs) + if val: val = wxHtmlRenderingStylePtr(val) + return val + def GetState(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_GetState(self, *_args, **_kwargs) + if val: val = wxHtmlRenderingStatePtr(val) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlRenderingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlRenderingInfo(wxHtmlRenderingInfoPtr): + def __init__(self,*_args,**_kwargs): + self.this = htmlc.new_wxHtmlRenderingInfo(*_args,**_kwargs) + self.thisown = 1 + + + + class wxHtmlCellPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 def GetPosX(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetPosX,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetPosX(self, *_args, **_kwargs) return val def GetPosY(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetPosY,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetPosY(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetWidth,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetHeight,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetHeight(self, *_args, **_kwargs) return val def GetDescent(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetDescent,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetDescent(self, *_args, **_kwargs) return val def GetLink(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetLink,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetLink(self, *_args, **_kwargs) if val: val = wxHtmlLinkInfoPtr(val) return val def GetNext(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetNext,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetNext(self, *_args, **_kwargs) if val: val = wxHtmlCellPtr(val) return val def GetParent(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_GetParent,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_GetParent(self, *_args, **_kwargs) if val: val = wxHtmlContainerCellPtr(val) return val + def GetFirstChild(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_GetFirstChild(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetCursor(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_GetCursor(self, *_args, **_kwargs) + if val: val = wxCursorPtr(val) ; val.thisown = 1 + return val + def IsFormattingCell(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_IsFormattingCell(self, *_args, **_kwargs) + return val def SetLink(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_SetLink,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_SetLink(self, *_args, **_kwargs) return val def SetNext(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_SetNext,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_SetNext(self, *_args, **_kwargs) return val def SetParent(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_SetParent,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_SetParent(self, *_args, **_kwargs) return val def SetPos(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_SetPos,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_SetPos(self, *_args, **_kwargs) return val def Layout(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_Layout,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_Layout(self, *_args, **_kwargs) return val def Draw(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_Draw,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_Draw(self, *_args, **_kwargs) return val def DrawInvisible(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_DrawInvisible,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_DrawInvisible(self, *_args, **_kwargs) return val def Find(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_Find,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_Find(self, *_args, **_kwargs) if val: val = wxHtmlCellPtr(val) return val def AdjustPagebreak(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_AdjustPagebreak,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_AdjustPagebreak(self, *_args, **_kwargs) return val def SetCanLiveOnPagebreak(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlCell_SetCanLiveOnPagebreak,(self,) + _args, _kwargs) + val = htmlc.wxHtmlCell_SetCanLiveOnPagebreak(self, *_args, **_kwargs) + return val + def IsLinebreakAllowed(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_IsLinebreakAllowed(self, *_args, **_kwargs) + return val + def IsTerminalCell(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_IsTerminalCell(self, *_args, **_kwargs) + return val + def FindCellByPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_FindCellByPos(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetAbsPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_GetAbsPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) ; val.thisown = 1 + return val + def GetFirstTerminal(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_GetFirstTerminal(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetLastTerminal(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_GetLastTerminal(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetDepth(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_GetDepth(self, *_args, **_kwargs) + return val + def IsBefore(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_IsBefore(self, *_args, **_kwargs) + return val + def ConvertToText(self, *_args, **_kwargs): + val = htmlc.wxHtmlCell_ConvertToText(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlCell(wxHtmlCellPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlCell,_args,_kwargs) + self.this = htmlc.new_wxHtmlCell(*_args,**_kwargs) self.thisown = 1 @@ -401,10 +625,10 @@ class wxHtmlWordCellPtr(wxHtmlCellPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlWordCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlWordCell(wxHtmlWordCellPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlWordCell,_args,_kwargs) + self.this = htmlc.new_wxHtmlWordCell(*_args,**_kwargs) self.thisown = 1 @@ -415,60 +639,61 @@ class wxHtmlContainerCellPtr(wxHtmlCellPtr): self.this = this self.thisown = 0 def InsertCell(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_InsertCell,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_InsertCell(self, *_args, **_kwargs) return val def SetAlignHor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetAlignHor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetAlignHor(self, *_args, **_kwargs) return val def GetAlignHor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_GetAlignHor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_GetAlignHor(self, *_args, **_kwargs) return val def SetAlignVer(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetAlignVer,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetAlignVer(self, *_args, **_kwargs) return val def GetAlignVer(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_GetAlignVer,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_GetAlignVer(self, *_args, **_kwargs) return val def SetIndent(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetIndent,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetIndent(self, *_args, **_kwargs) return val def GetIndent(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_GetIndent,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_GetIndent(self, *_args, **_kwargs) return val def GetIndentUnits(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_GetIndentUnits,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_GetIndentUnits(self, *_args, **_kwargs) return val def SetAlign(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetAlign,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetAlign(self, *_args, **_kwargs) return val def SetWidthFloat(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetWidthFloat,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetWidthFloat(self, *_args, **_kwargs) return val def SetWidthFloatFromTag(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetWidthFloatFromTag,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetWidthFloatFromTag(self, *_args, **_kwargs) return val def SetMinHeight(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetMinHeight,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetMinHeight(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetBackgroundColour,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetBackgroundColour(self, *_args, **_kwargs) return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_GetBackgroundColour,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetBorder(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_SetBorder,(self,) + _args, _kwargs) + val = htmlc.wxHtmlContainerCell_SetBorder(self, *_args, **_kwargs) return val - def GetFirstCell(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlContainerCell_GetFirstCell,(self,) + _args, _kwargs) + def GetFirstChild(self, *_args, **_kwargs): + val = htmlc.wxHtmlContainerCell_GetFirstChild(self, *_args, **_kwargs) if val: val = wxHtmlCellPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlContainerCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + GetFirstCell = GetFirstChild class wxHtmlContainerCell(wxHtmlContainerCellPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlContainerCell,_args,_kwargs) + self.this = htmlc.new_wxHtmlContainerCell(*_args,**_kwargs) self.thisown = 1 @@ -479,10 +704,10 @@ class wxHtmlColourCellPtr(wxHtmlCellPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlColourCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlColourCell(wxHtmlColourCellPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlColourCell,_args,_kwargs) + self.this = htmlc.new_wxHtmlColourCell(*_args,**_kwargs) self.thisown = 1 @@ -493,10 +718,10 @@ class wxHtmlFontCellPtr(wxHtmlCellPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlFontCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlFontCell(wxHtmlFontCellPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlFontCell,_args,_kwargs) + self.this = htmlc.new_wxHtmlFontCell(*_args,**_kwargs) self.thisown = 1 @@ -507,10 +732,10 @@ class wxHtmlWidgetCellPtr(wxHtmlCellPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlWidgetCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlWidgetCell(wxHtmlWidgetCellPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlWidgetCell,_args,_kwargs) + self.this = htmlc.new_wxHtmlWidgetCell(*_args,**_kwargs) self.thisown = 1 @@ -521,13 +746,13 @@ class wxHtmlFilterPtr(wxObjectPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlFilter__setCallbackInfo,(self,) + _args, _kwargs) + val = htmlc.wxHtmlFilter__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlFilter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlFilter(wxHtmlFilterPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlFilter,_args,_kwargs) + self.this = htmlc.new_wxHtmlFilter(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxHtmlFilter) @@ -539,99 +764,102 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_Create,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_Create(self, *_args, **_kwargs) return val def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow__setCallbackInfo,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow__setCallbackInfo(self, *_args, **_kwargs) return val def SetPage(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_SetPage,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_SetPage(self, *_args, **_kwargs) return val def LoadPage(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_LoadPage,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_LoadPage(self, *_args, **_kwargs) + return val + def LoadFile(self, *_args, **_kwargs): + val = htmlc.wxHtmlWindow_LoadFile(self, *_args, **_kwargs) return val def AppendToPage(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_AppendToPage,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_AppendToPage(self, *_args, **_kwargs) return val def GetOpenedPage(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_GetOpenedPage,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_GetOpenedPage(self, *_args, **_kwargs) return val def GetOpenedAnchor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_GetOpenedAnchor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_GetOpenedAnchor(self, *_args, **_kwargs) return val def GetOpenedPageTitle(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_GetOpenedPageTitle,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_GetOpenedPageTitle(self, *_args, **_kwargs) return val def SetRelatedFrame(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_SetRelatedFrame,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_SetRelatedFrame(self, *_args, **_kwargs) return val def GetRelatedFrame(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_GetRelatedFrame,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_GetRelatedFrame(self, *_args, **_kwargs) return val def SetRelatedStatusBar(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_SetRelatedStatusBar,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_SetRelatedStatusBar(self, *_args, **_kwargs) return val def SetFonts(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_SetFonts,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_SetFonts(self, *_args, **_kwargs) return val def SetTitle(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_SetTitle,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_SetTitle(self, *_args, **_kwargs) return val def SetBorders(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_SetBorders,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_SetBorders(self, *_args, **_kwargs) return val def ReadCustomization(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_ReadCustomization,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_ReadCustomization(self, *_args, **_kwargs) return val def WriteCustomization(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_WriteCustomization,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_WriteCustomization(self, *_args, **_kwargs) return val def HistoryBack(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_HistoryBack,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_HistoryBack(self, *_args, **_kwargs) return val def HistoryForward(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_HistoryForward,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_HistoryForward(self, *_args, **_kwargs) return val def HistoryCanBack(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_HistoryCanBack,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_HistoryCanBack(self, *_args, **_kwargs) return val def HistoryCanForward(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_HistoryCanForward,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_HistoryCanForward(self, *_args, **_kwargs) return val def HistoryClear(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_HistoryClear,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_HistoryClear(self, *_args, **_kwargs) return val def GetInternalRepresentation(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_GetInternalRepresentation,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_GetInternalRepresentation(self, *_args, **_kwargs) if val: val = wxHtmlContainerCellPtr(val) return val def GetParser(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_GetParser,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_GetParser(self, *_args, **_kwargs) if val: val = wxHtmlWinParserPtr(val) return val def ScrollToAnchor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_ScrollToAnchor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_ScrollToAnchor(self, *_args, **_kwargs) return val def HasAnchor(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_HasAnchor,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_HasAnchor(self, *_args, **_kwargs) return val def base_OnLinkClicked(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_base_OnLinkClicked,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_base_OnLinkClicked(self, *_args, **_kwargs) return val def base_OnSetTitle(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_base_OnSetTitle,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_base_OnSetTitle(self, *_args, **_kwargs) return val def base_OnCellMouseHover(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_base_OnCellMouseHover,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_base_OnCellMouseHover(self, *_args, **_kwargs) return val def base_OnCellClicked(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlWindow_base_OnCellClicked,(self,) + _args, _kwargs) + val = htmlc.wxHtmlWindow_base_OnCellClicked(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlWindow(wxHtmlWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlWindow,_args,_kwargs) + self.this = htmlc.new_wxHtmlWindow(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxHtmlWindow) self._setOORInfo(self) @@ -639,7 +867,7 @@ class wxHtmlWindow(wxHtmlWindowPtr): def wxPreHtmlWindow(*_args,**_kwargs): - val = wxHtmlWindowPtr(apply(htmlc.new_wxPreHtmlWindow,_args,_kwargs)) + val = wxHtmlWindowPtr(htmlc.new_wxPreHtmlWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -656,28 +884,28 @@ class wxHtmlDCRendererPtr(wxObjectPtr): except: pass def SetDC(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlDCRenderer_SetDC,(self,) + _args, _kwargs) + val = htmlc.wxHtmlDCRenderer_SetDC(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlDCRenderer_SetSize,(self,) + _args, _kwargs) + val = htmlc.wxHtmlDCRenderer_SetSize(self, *_args, **_kwargs) return val def SetHtmlText(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlDCRenderer_SetHtmlText,(self,) + _args, _kwargs) + val = htmlc.wxHtmlDCRenderer_SetHtmlText(self, *_args, **_kwargs) return val def SetFonts(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlDCRenderer_SetFonts,(self,) + _args, _kwargs) + val = htmlc.wxHtmlDCRenderer_SetFonts(self, *_args, **_kwargs) return val def Render(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlDCRenderer_Render,(self,) + _args, _kwargs) + val = htmlc.wxHtmlDCRenderer_Render(self, *_args, **_kwargs) return val def GetTotalHeight(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlDCRenderer_GetTotalHeight,(self,) + _args, _kwargs) + val = htmlc.wxHtmlDCRenderer_GetTotalHeight(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlDCRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlDCRenderer(wxHtmlDCRendererPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlDCRenderer,_args,_kwargs) + self.this = htmlc.new_wxHtmlDCRenderer(*_args,**_kwargs) self.thisown = 1 @@ -688,28 +916,28 @@ class wxHtmlPrintoutPtr(wxPrintoutPtr): self.this = this self.thisown = 0 def SetHtmlText(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlPrintout_SetHtmlText,(self,) + _args, _kwargs) + val = htmlc.wxHtmlPrintout_SetHtmlText(self, *_args, **_kwargs) return val def SetHtmlFile(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlPrintout_SetHtmlFile,(self,) + _args, _kwargs) + val = htmlc.wxHtmlPrintout_SetHtmlFile(self, *_args, **_kwargs) return val def SetHeader(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlPrintout_SetHeader,(self,) + _args, _kwargs) + val = htmlc.wxHtmlPrintout_SetHeader(self, *_args, **_kwargs) return val def SetFooter(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlPrintout_SetFooter,(self,) + _args, _kwargs) + val = htmlc.wxHtmlPrintout_SetFooter(self, *_args, **_kwargs) return val def SetFonts(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlPrintout_SetFonts,(self,) + _args, _kwargs) + val = htmlc.wxHtmlPrintout_SetFonts(self, *_args, **_kwargs) return val def SetMargins(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlPrintout_SetMargins,(self,) + _args, _kwargs) + val = htmlc.wxHtmlPrintout_SetMargins(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlPrintout(wxHtmlPrintoutPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlPrintout,_args,_kwargs) + self.this = htmlc.new_wxHtmlPrintout(*_args,**_kwargs) self.thisown = 1 @@ -726,45 +954,45 @@ class wxHtmlEasyPrintingPtr(wxObjectPtr): except: pass def PreviewFile(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_PreviewFile,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_PreviewFile(self, *_args, **_kwargs) return val def PreviewText(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_PreviewText,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_PreviewText(self, *_args, **_kwargs) return val def PrintFile(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_PrintFile,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_PrintFile(self, *_args, **_kwargs) return val def PrintText(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_PrintText,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_PrintText(self, *_args, **_kwargs) return val def PrinterSetup(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_PrinterSetup,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_PrinterSetup(self, *_args, **_kwargs) return val def PageSetup(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_PageSetup,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_PageSetup(self, *_args, **_kwargs) return val def SetHeader(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_SetHeader,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_SetHeader(self, *_args, **_kwargs) return val def SetFooter(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_SetFooter,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_SetFooter(self, *_args, **_kwargs) return val def SetFonts(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_SetFonts,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_SetFonts(self, *_args, **_kwargs) return val def GetPrintData(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_GetPrintData,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_GetPrintData(self, *_args, **_kwargs) if val: val = wxPrintDataPtr(val) return val def GetPageSetupData(self, *_args, **_kwargs): - val = apply(htmlc.wxHtmlEasyPrinting_GetPageSetupData,(self,) + _args, _kwargs) + val = htmlc.wxHtmlEasyPrinting_GetPageSetupData(self, *_args, **_kwargs) if val: val = wxPageSetupDialogDataPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlEasyPrinting(wxHtmlEasyPrintingPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlc.new_wxHtmlEasyPrinting,_args,_kwargs) + self.this = htmlc.new_wxHtmlEasyPrinting(*_args,**_kwargs) self.thisown = 1 @@ -778,6 +1006,10 @@ wxHtmlWinParser_AddTagHandler = htmlc.wxHtmlWinParser_AddTagHandler wxHtmlWindow_AddFilter = htmlc.wxHtmlWindow_AddFilter +wxHtmlPrintout_AddFilter = htmlc.wxHtmlPrintout_AddFilter + +wxHtmlPrintout_CleanUpStatics = htmlc.wxHtmlPrintout_CleanUpStatics + #-------------- VARIABLE WRAPPERS ------------------ @@ -803,12 +1035,20 @@ wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP wxHTML_COND_USER = htmlc.wxHTML_COND_USER wxHW_SCROLLBAR_NEVER = htmlc.wxHW_SCROLLBAR_NEVER wxHW_SCROLLBAR_AUTO = htmlc.wxHW_SCROLLBAR_AUTO +wxHW_NO_SELECTION = htmlc.wxHW_NO_SELECTION +wxHW_DEFAULT_STYLE = htmlc.wxHW_DEFAULT_STYLE wxHTML_OPEN = htmlc.wxHTML_OPEN wxHTML_BLOCK = htmlc.wxHTML_BLOCK wxHTML_REDIRECT = htmlc.wxHTML_REDIRECT wxHTML_URL_PAGE = htmlc.wxHTML_URL_PAGE wxHTML_URL_IMAGE = htmlc.wxHTML_URL_IMAGE wxHTML_URL_OTHER = htmlc.wxHTML_URL_OTHER +wxHTML_SEL_OUT = htmlc.wxHTML_SEL_OUT +wxHTML_SEL_IN = htmlc.wxHTML_SEL_IN +wxHTML_SEL_CHANGING = htmlc.wxHTML_SEL_CHANGING +wxHTML_FIND_EXACT = htmlc.wxHTML_FIND_EXACT +wxHTML_FIND_NEAREST_BEFORE = htmlc.wxHTML_FIND_NEAREST_BEFORE +wxHTML_FIND_NEAREST_AFTER = htmlc.wxHTML_FIND_NEAREST_AFTER wxPAGE_ODD = htmlc.wxPAGE_ODD wxPAGE_EVEN = htmlc.wxPAGE_EVEN wxPAGE_ALL = htmlc.wxPAGE_ALL diff --git a/wxPython/src/msw/htmlhelp.py b/wxPython/src/msw/htmlhelp.py index 33fdd1e5df..778663be9f 100644 --- a/wxPython/src/msw/htmlhelp.py +++ b/wxPython/src/msw/htmlhelp.py @@ -47,43 +47,43 @@ class wxHtmlBookRecordPtr : self.this = this self.thisown = 0 def GetBookFile(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_GetBookFile,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_GetBookFile(self, *_args, **_kwargs) return val def GetTitle(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_GetTitle,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_GetTitle(self, *_args, **_kwargs) return val def GetStart(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_GetStart,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_GetStart(self, *_args, **_kwargs) return val def GetBasePath(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_GetBasePath,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_GetBasePath(self, *_args, **_kwargs) return val def SetContentsRange(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_SetContentsRange,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_SetContentsRange(self, *_args, **_kwargs) return val def GetContentsStart(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_GetContentsStart,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_GetContentsStart(self, *_args, **_kwargs) return val def GetContentsEnd(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_GetContentsEnd,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_GetContentsEnd(self, *_args, **_kwargs) return val def SetTitle(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_SetTitle,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_SetTitle(self, *_args, **_kwargs) return val def SetBasePath(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_SetBasePath,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_SetBasePath(self, *_args, **_kwargs) return val def SetStart(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_SetStart,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_SetStart(self, *_args, **_kwargs) return val def GetFullPath(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlBookRecord_GetFullPath,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlBookRecord_GetFullPath(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlBookRecord(wxHtmlBookRecordPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlhelpc.new_wxHtmlBookRecord,_args,_kwargs) + self.this = htmlhelpc.new_wxHtmlBookRecord(*_args,**_kwargs) self.thisown = 1 @@ -94,23 +94,23 @@ class wxHtmlContentsItemPtr : self.this = this self.thisown = 0 def GetLevel(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlContentsItem_GetLevel,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlContentsItem_GetLevel(self, *_args, **_kwargs) return val def GetID(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlContentsItem_GetID,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlContentsItem_GetID(self, *_args, **_kwargs) return val def GetName(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlContentsItem_GetName,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlContentsItem_GetName(self, *_args, **_kwargs) return val def GetPage(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlContentsItem_GetPage,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlContentsItem_GetPage(self, *_args, **_kwargs) return val def GetBook(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlContentsItem_GetBook,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlContentsItem_GetBook(self, *_args, **_kwargs) if val: val = wxHtmlBookRecordPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlContentsItem(wxHtmlContentsItemPtr): def __init__(self,this): self.this = this @@ -123,26 +123,26 @@ class wxHtmlSearchStatusPtr : self.this = this self.thisown = 0 def Search(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlSearchStatus_Search,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlSearchStatus_Search(self, *_args, **_kwargs) return val def IsActive(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlSearchStatus_IsActive,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlSearchStatus_IsActive(self, *_args, **_kwargs) return val def GetCurIndex(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlSearchStatus_GetCurIndex,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlSearchStatus_GetCurIndex(self, *_args, **_kwargs) return val def GetMaxIndex(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlSearchStatus_GetMaxIndex,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlSearchStatus_GetMaxIndex(self, *_args, **_kwargs) return val def GetName(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlSearchStatus_GetName,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlSearchStatus_GetName(self, *_args, **_kwargs) return val def GetContentsItem(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlSearchStatus_GetContentsItem,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlSearchStatus_GetContentsItem(self, *_args, **_kwargs) if val: val = wxHtmlContentsItemPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlSearchStatus instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlSearchStatus(wxHtmlSearchStatusPtr): def __init__(self,this): self.this = this @@ -161,39 +161,39 @@ class wxHtmlHelpDataPtr : except: pass def SetTempDir(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_SetTempDir,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_SetTempDir(self, *_args, **_kwargs) return val def AddBook(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_AddBook,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_AddBook(self, *_args, **_kwargs) return val def FindPageByName(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_FindPageByName,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_FindPageByName(self, *_args, **_kwargs) return val def FindPageById(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_FindPageById,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_FindPageById(self, *_args, **_kwargs) return val def GetBookRecArray(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_GetBookRecArray,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_GetBookRecArray(self, *_args, **_kwargs) return val def GetContents(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_GetContents,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_GetContents(self, *_args, **_kwargs) if val: val = wxHtmlContentsItemPtr(val) return val def GetContentsCnt(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_GetContentsCnt,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_GetContentsCnt(self, *_args, **_kwargs) return val def GetIndex(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_GetIndex,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_GetIndex(self, *_args, **_kwargs) if val: val = wxHtmlContentsItemPtr(val) return val def GetIndexCnt(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_GetIndexCnt,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpData_GetIndexCnt(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlHelpData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlHelpData(wxHtmlHelpDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlhelpc.new_wxHtmlHelpData,_args,_kwargs) + self.this = htmlhelpc.new_wxHtmlHelpData(*_args,**_kwargs) self.thisown = 1 @@ -204,41 +204,41 @@ class wxHtmlHelpFramePtr(wxFramePtr): self.this = this self.thisown = 0 def GetData(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_GetData,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_GetData(self, *_args, **_kwargs) if val: val = wxHtmlHelpDataPtr(val) return val def SetTitleFormat(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_SetTitleFormat,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_SetTitleFormat(self, *_args, **_kwargs) return val def Display(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_Display,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_Display(self, *_args, **_kwargs) return val def DisplayID(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayID,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_DisplayID(self, *_args, **_kwargs) return val def DisplayContents(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayContents,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_DisplayContents(self, *_args, **_kwargs) return val def DisplayIndex(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayIndex,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_DisplayIndex(self, *_args, **_kwargs) return val def KeywordSearch(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_KeywordSearch,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_KeywordSearch(self, *_args, **_kwargs) return val def UseConfig(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_UseConfig,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_UseConfig(self, *_args, **_kwargs) return val def ReadCustomization(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_ReadCustomization,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_ReadCustomization(self, *_args, **_kwargs) return val def WriteCustomization(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpFrame_WriteCustomization,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpFrame_WriteCustomization(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlHelpFrame(wxHtmlHelpFramePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlhelpc.new_wxHtmlHelpFrame,_args,_kwargs) + self.this = htmlhelpc.new_wxHtmlHelpFrame(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -256,47 +256,47 @@ class wxHtmlHelpControllerPtr(wxEvtHandlerPtr): except: pass def SetTitleFormat(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_SetTitleFormat(self, *_args, **_kwargs) return val def SetTempDir(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_SetTempDir,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_SetTempDir(self, *_args, **_kwargs) return val def AddBook(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_AddBook,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_AddBook(self, *_args, **_kwargs) return val def Display(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_Display,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_Display(self, *_args, **_kwargs) return val def DisplayID(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_DisplayID,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_DisplayID(self, *_args, **_kwargs) return val def DisplayContents(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_DisplayContents,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_DisplayContents(self, *_args, **_kwargs) return val def DisplayIndex(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_DisplayIndex,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_DisplayIndex(self, *_args, **_kwargs) return val def KeywordSearch(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_KeywordSearch,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_KeywordSearch(self, *_args, **_kwargs) return val def UseConfig(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_UseConfig,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_UseConfig(self, *_args, **_kwargs) return val def ReadCustomization(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_ReadCustomization,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_ReadCustomization(self, *_args, **_kwargs) return val def WriteCustomization(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_WriteCustomization,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_WriteCustomization(self, *_args, **_kwargs) return val def GetFrame(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpController_GetFrame,(self,) + _args, _kwargs) + val = htmlhelpc.wxHtmlHelpController_GetFrame(self, *_args, **_kwargs) if val: val = wxHtmlHelpFramePtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxHtmlHelpController(wxHtmlHelpControllerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(htmlhelpc.new_wxHtmlHelpController,_args,_kwargs) + self.this = htmlhelpc.new_wxHtmlHelpController(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) diff --git a/wxPython/src/msw/image.cpp b/wxPython/src/msw/image.cpp index 641781fd56..44b65e5906 100644 --- a/wxPython/src/msw/image.cpp +++ b/wxPython/src/msw/image.cpp @@ -85,11 +85,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - wxImage* wxEmptyImage(int width=0, int height=0) { - if (width == 0 && height == 0) - return new wxImage; + wxImage* wxEmptyImage(int width=0, int height=0, bool clear = TRUE) { + if (width > 0 && height > 0) + return new wxImage(width, height, clear); else - return new wxImage(width, height); + return new wxImage; } @@ -143,15 +143,18 @@ static PyObject *_wrap_wxEmptyImage(PyObject *self, PyObject *args, PyObject *kw wxImage * _result; int _arg0 = (int ) 0; int _arg1 = (int ) 0; - char *_kwnames[] = { "width","height", NULL }; + bool _arg2 = (bool ) TRUE; + int tempbool2 = (int) TRUE; + char *_kwnames[] = { "width","height","clear", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:wxEmptyImage",_kwnames,&_arg0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iii:wxEmptyImage",_kwnames,&_arg0,&_arg1,&tempbool2)) return NULL; + _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxImage *)wxEmptyImage(_arg0,_arg1); + _result = (wxImage *)wxEmptyImage(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3536,6 +3539,33 @@ static PyObject *_wrap_wxImage_RemoveHandler(PyObject *self, PyObject *args, PyO return _resultobj; } +static PyObject *_wrap_wxImage_GetImageExtWildcard(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxImage_GetImageExtWildcard",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxString (wxImage::GetImageExtWildcard()); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + delete _result; +} + return _resultobj; +} + static wxBitmap wxImage_ConvertToBitmap(wxImage *self) { wxBitmap bitmap(*self); return bitmap; @@ -3609,6 +3639,7 @@ static PyObject *_wrap_wxImage_ConvertToMonoBitmap(PyObject *self, PyObject *arg static PyMethodDef imagecMethods[] = { { "wxImage_ConvertToMonoBitmap", (PyCFunction) _wrap_wxImage_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxImage_GetImageExtWildcard", (PyCFunction) _wrap_wxImage_GetImageExtWildcard, METH_VARARGS | METH_KEYWORDS }, { "wxImage_RemoveHandler", (PyCFunction) _wrap_wxImage_RemoveHandler, METH_VARARGS | METH_KEYWORDS }, { "wxImage_InsertHandler", (PyCFunction) _wrap_wxImage_InsertHandler, METH_VARARGS | METH_KEYWORDS }, { "wxImage_AddHandler", (PyCFunction) _wrap_wxImage_AddHandler, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/image.py b/wxPython/src/msw/image.py index c4d1896bd2..26849e2e6a 100644 --- a/wxPython/src/msw/image.py +++ b/wxPython/src/msw/image.py @@ -13,13 +13,13 @@ class wxImageHistogramPtr : self.this = this self.thisown = 0 def FindFirstUnusedColour(self, *_args, **_kwargs): - val = apply(imagec.wxImageHistogram_FindFirstUnusedColour,(self,) + _args, _kwargs) + val = imagec.wxImageHistogram_FindFirstUnusedColour(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxImageHistogram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxImageHistogram(wxImageHistogramPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxImageHistogram,_args,_kwargs) + self.this = imagec.new_wxImageHistogram(*_args,**_kwargs) self.thisown = 1 @@ -30,34 +30,34 @@ class wxImageHandlerPtr(wxObjectPtr): self.this = this self.thisown = 0 def GetName(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_GetName,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_GetName(self, *_args, **_kwargs) return val def GetExtension(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_GetExtension,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_GetExtension(self, *_args, **_kwargs) return val def GetType(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_GetType,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_GetType(self, *_args, **_kwargs) return val def GetMimeType(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_GetMimeType,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_GetMimeType(self, *_args, **_kwargs) return val def CanRead(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_CanRead,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_CanRead(self, *_args, **_kwargs) return val def SetName(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_SetName,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_SetName(self, *_args, **_kwargs) return val def SetExtension(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_SetExtension,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_SetExtension(self, *_args, **_kwargs) return val def SetType(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_SetType,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_SetType(self, *_args, **_kwargs) return val def SetMimeType(self, *_args, **_kwargs): - val = apply(imagec.wxImageHandler_SetMimeType,(self,) + _args, _kwargs) + val = imagec.wxImageHandler_SetMimeType(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxImageHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxImageHandler(wxImageHandlerPtr): def __init__(self,this): self.this = this @@ -70,10 +70,10 @@ class wxPNGHandlerPtr(wxImageHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPNGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPNGHandler(wxPNGHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxPNGHandler,_args,_kwargs) + self.this = imagec.new_wxPNGHandler(*_args,**_kwargs) self.thisown = 1 @@ -84,10 +84,10 @@ class wxJPEGHandlerPtr(wxImageHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxJPEGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxJPEGHandler(wxJPEGHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxJPEGHandler,_args,_kwargs) + self.this = imagec.new_wxJPEGHandler(*_args,**_kwargs) self.thisown = 1 @@ -98,10 +98,10 @@ class wxBMPHandlerPtr(wxImageHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBMPHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBMPHandler(wxBMPHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxBMPHandler,_args,_kwargs) + self.this = imagec.new_wxBMPHandler(*_args,**_kwargs) self.thisown = 1 @@ -112,10 +112,10 @@ class wxICOHandlerPtr(wxBMPHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxICOHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxICOHandler(wxICOHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxICOHandler,_args,_kwargs) + self.this = imagec.new_wxICOHandler(*_args,**_kwargs) self.thisown = 1 @@ -126,10 +126,10 @@ class wxCURHandlerPtr(wxICOHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCURHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCURHandler(wxCURHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxCURHandler,_args,_kwargs) + self.this = imagec.new_wxCURHandler(*_args,**_kwargs) self.thisown = 1 @@ -140,10 +140,10 @@ class wxANIHandlerPtr(wxCURHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxANIHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxANIHandler(wxANIHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxANIHandler,_args,_kwargs) + self.this = imagec.new_wxANIHandler(*_args,**_kwargs) self.thisown = 1 @@ -154,10 +154,10 @@ class wxGIFHandlerPtr(wxImageHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGIFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGIFHandler(wxGIFHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxGIFHandler,_args,_kwargs) + self.this = imagec.new_wxGIFHandler(*_args,**_kwargs) self.thisown = 1 @@ -168,10 +168,10 @@ class wxPNMHandlerPtr(wxImageHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPNMHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPNMHandler(wxPNMHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxPNMHandler,_args,_kwargs) + self.this = imagec.new_wxPNMHandler(*_args,**_kwargs) self.thisown = 1 @@ -182,10 +182,10 @@ class wxPCXHandlerPtr(wxImageHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPCXHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPCXHandler(wxPCXHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxPCXHandler,_args,_kwargs) + self.this = imagec.new_wxPCXHandler(*_args,**_kwargs) self.thisown = 1 @@ -196,10 +196,10 @@ class wxTIFFHandlerPtr(wxImageHandlerPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTIFFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTIFFHandler(wxTIFFHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxTIFFHandler,_args,_kwargs) + self.this = imagec.new_wxTIFFHandler(*_args,**_kwargs) self.thisown = 1 @@ -216,183 +216,184 @@ class wxImagePtr(wxObjectPtr): except: pass def Create(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs) + val = imagec.wxImage_Create(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Destroy,(self,) + _args, _kwargs) + val = imagec.wxImage_Destroy(self, *_args, **_kwargs) return val def Scale(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Scale,(self,) + _args, _kwargs) + val = imagec.wxImage_Scale(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def ShrinkBy(self, *_args, **_kwargs): - val = apply(imagec.wxImage_ShrinkBy,(self,) + _args, _kwargs) + val = imagec.wxImage_ShrinkBy(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def Rescale(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Rescale,(self,) + _args, _kwargs) + val = imagec.wxImage_Rescale(self, *_args, **_kwargs) if val: val = wxImagePtr(val) return val def SetRGB(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetRGB,(self,) + _args, _kwargs) + val = imagec.wxImage_SetRGB(self, *_args, **_kwargs) return val def GetRed(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetRed,(self,) + _args, _kwargs) + val = imagec.wxImage_GetRed(self, *_args, **_kwargs) return val def GetGreen(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetGreen,(self,) + _args, _kwargs) + val = imagec.wxImage_GetGreen(self, *_args, **_kwargs) return val def GetBlue(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetBlue,(self,) + _args, _kwargs) + val = imagec.wxImage_GetBlue(self, *_args, **_kwargs) return val def SetAlpha(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetAlpha,(self,) + _args, _kwargs) + val = imagec.wxImage_SetAlpha(self, *_args, **_kwargs) return val def GetAlpha(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetAlpha,(self,) + _args, _kwargs) + val = imagec.wxImage_GetAlpha(self, *_args, **_kwargs) return val def HasAlpha(self, *_args, **_kwargs): - val = apply(imagec.wxImage_HasAlpha,(self,) + _args, _kwargs) + val = imagec.wxImage_HasAlpha(self, *_args, **_kwargs) return val def FindFirstUnusedColour(self, *_args, **_kwargs): - val = apply(imagec.wxImage_FindFirstUnusedColour,(self,) + _args, _kwargs) + val = imagec.wxImage_FindFirstUnusedColour(self, *_args, **_kwargs) return val def SetMaskFromImage(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetMaskFromImage,(self,) + _args, _kwargs) + val = imagec.wxImage_SetMaskFromImage(self, *_args, **_kwargs) return val def LoadFile(self, *_args, **_kwargs): - val = apply(imagec.wxImage_LoadFile,(self,) + _args, _kwargs) + val = imagec.wxImage_LoadFile(self, *_args, **_kwargs) return val def LoadMimeFile(self, *_args, **_kwargs): - val = apply(imagec.wxImage_LoadMimeFile,(self,) + _args, _kwargs) + val = imagec.wxImage_LoadMimeFile(self, *_args, **_kwargs) return val def SaveFile(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SaveFile,(self,) + _args, _kwargs) + val = imagec.wxImage_SaveFile(self, *_args, **_kwargs) return val def SaveMimeFile(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SaveMimeFile,(self,) + _args, _kwargs) + val = imagec.wxImage_SaveMimeFile(self, *_args, **_kwargs) return val def LoadStream(self, *_args, **_kwargs): - val = apply(imagec.wxImage_LoadStream,(self,) + _args, _kwargs) + val = imagec.wxImage_LoadStream(self, *_args, **_kwargs) return val def LoadMimeStream(self, *_args, **_kwargs): - val = apply(imagec.wxImage_LoadMimeStream,(self,) + _args, _kwargs) + val = imagec.wxImage_LoadMimeStream(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Ok,(self,) + _args, _kwargs) + val = imagec.wxImage_Ok(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetWidth,(self,) + _args, _kwargs) + val = imagec.wxImage_GetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetHeight,(self,) + _args, _kwargs) + val = imagec.wxImage_GetHeight(self, *_args, **_kwargs) return val def GetSubImage(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetSubImage,(self,) + _args, _kwargs) + val = imagec.wxImage_GetSubImage(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def Copy(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Copy,(self,) + _args, _kwargs) + val = imagec.wxImage_Copy(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def Paste(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Paste,(self,) + _args, _kwargs) + val = imagec.wxImage_Paste(self, *_args, **_kwargs) return val def GetData(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetData,(self,) + _args, _kwargs) + val = imagec.wxImage_GetData(self, *_args, **_kwargs) return val def SetData(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetData,(self,) + _args, _kwargs) + val = imagec.wxImage_SetData(self, *_args, **_kwargs) return val def GetDataBuffer(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetDataBuffer,(self,) + _args, _kwargs) + val = imagec.wxImage_GetDataBuffer(self, *_args, **_kwargs) return val def SetDataBuffer(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetDataBuffer,(self,) + _args, _kwargs) + val = imagec.wxImage_SetDataBuffer(self, *_args, **_kwargs) return val def GetAlphaData(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetAlphaData,(self,) + _args, _kwargs) + val = imagec.wxImage_GetAlphaData(self, *_args, **_kwargs) return val def SetAlphaData(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetAlphaData,(self,) + _args, _kwargs) + val = imagec.wxImage_SetAlphaData(self, *_args, **_kwargs) return val def GetAlphaBuffer(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetAlphaBuffer,(self,) + _args, _kwargs) + val = imagec.wxImage_GetAlphaBuffer(self, *_args, **_kwargs) return val def SetAlphaBuffer(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetAlphaBuffer,(self,) + _args, _kwargs) + val = imagec.wxImage_SetAlphaBuffer(self, *_args, **_kwargs) return val def SetMaskColour(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetMaskColour,(self,) + _args, _kwargs) + val = imagec.wxImage_SetMaskColour(self, *_args, **_kwargs) return val def GetMaskRed(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetMaskRed,(self,) + _args, _kwargs) + val = imagec.wxImage_GetMaskRed(self, *_args, **_kwargs) return val def GetMaskGreen(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetMaskGreen,(self,) + _args, _kwargs) + val = imagec.wxImage_GetMaskGreen(self, *_args, **_kwargs) return val def GetMaskBlue(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetMaskBlue,(self,) + _args, _kwargs) + val = imagec.wxImage_GetMaskBlue(self, *_args, **_kwargs) return val def SetMask(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetMask,(self,) + _args, _kwargs) + val = imagec.wxImage_SetMask(self, *_args, **_kwargs) return val def HasMask(self, *_args, **_kwargs): - val = apply(imagec.wxImage_HasMask,(self,) + _args, _kwargs) + val = imagec.wxImage_HasMask(self, *_args, **_kwargs) return val def Rotate(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Rotate,(self,) + _args, _kwargs) + val = imagec.wxImage_Rotate(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def Rotate90(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Rotate90,(self,) + _args, _kwargs) + val = imagec.wxImage_Rotate90(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def Mirror(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Mirror,(self,) + _args, _kwargs) + val = imagec.wxImage_Mirror(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def Replace(self, *_args, **_kwargs): - val = apply(imagec.wxImage_Replace,(self,) + _args, _kwargs) + val = imagec.wxImage_Replace(self, *_args, **_kwargs) return val def ConvertToMono(self, *_args, **_kwargs): - val = apply(imagec.wxImage_ConvertToMono,(self,) + _args, _kwargs) + val = imagec.wxImage_ConvertToMono(self, *_args, **_kwargs) if val: val = wxImagePtr(val) ; val.thisown = 1 return val def SetOption(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetOption,(self,) + _args, _kwargs) + val = imagec.wxImage_SetOption(self, *_args, **_kwargs) return val def SetOptionInt(self, *_args, **_kwargs): - val = apply(imagec.wxImage_SetOptionInt,(self,) + _args, _kwargs) + val = imagec.wxImage_SetOptionInt(self, *_args, **_kwargs) return val def GetOption(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetOption,(self,) + _args, _kwargs) + val = imagec.wxImage_GetOption(self, *_args, **_kwargs) return val def GetOptionInt(self, *_args, **_kwargs): - val = apply(imagec.wxImage_GetOptionInt,(self,) + _args, _kwargs) + val = imagec.wxImage_GetOptionInt(self, *_args, **_kwargs) return val def HasOption(self, *_args, **_kwargs): - val = apply(imagec.wxImage_HasOption,(self,) + _args, _kwargs) + val = imagec.wxImage_HasOption(self, *_args, **_kwargs) return val def CountColours(self, *_args, **_kwargs): - val = apply(imagec.wxImage_CountColours,(self,) + _args, _kwargs) + val = imagec.wxImage_CountColours(self, *_args, **_kwargs) return val def ComputeHistogram(self, *_args, **_kwargs): - val = apply(imagec.wxImage_ComputeHistogram,(self,) + _args, _kwargs) + val = imagec.wxImage_ComputeHistogram(self, *_args, **_kwargs) return val def ConvertToBitmap(self, *_args, **_kwargs): - val = apply(imagec.wxImage_ConvertToBitmap,(self,) + _args, _kwargs) + val = imagec.wxImage_ConvertToBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def ConvertToMonoBitmap(self, *_args, **_kwargs): - val = apply(imagec.wxImage_ConvertToMonoBitmap,(self,) + _args, _kwargs) + val = imagec.wxImage_ConvertToMonoBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxImage(wxImagePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(imagec.new_wxImage,_args,_kwargs) + self.this = imagec.new_wxImage(*_args,**_kwargs) self.thisown = 1 @@ -403,39 +404,39 @@ class wxImage(wxImagePtr): #-------------- FUNCTION WRAPPERS ------------------ def wxEmptyImage(*_args, **_kwargs): - val = apply(imagec.wxEmptyImage,_args,_kwargs) + val = imagec.wxEmptyImage(*_args,**_kwargs) if val: val = wxImagePtr(val); val.thisown = 1 return val def wxImageFromMime(*_args, **_kwargs): - val = apply(imagec.wxImageFromMime,_args,_kwargs) + val = imagec.wxImageFromMime(*_args,**_kwargs) if val: val = wxImagePtr(val); val.thisown = 1 return val def wxImageFromBitmap(*_args, **_kwargs): - val = apply(imagec.wxImageFromBitmap,_args,_kwargs) + val = imagec.wxImageFromBitmap(*_args,**_kwargs) if val: val = wxImagePtr(val); val.thisown = 1 return val def wxImageFromData(*_args, **_kwargs): - val = apply(imagec.wxImageFromData,_args,_kwargs) + val = imagec.wxImageFromData(*_args,**_kwargs) if val: val = wxImagePtr(val); val.thisown = 1 return val def wxImageFromStream(*_args, **_kwargs): - val = apply(imagec.wxImageFromStream,_args,_kwargs) + val = imagec.wxImageFromStream(*_args,**_kwargs) if val: val = wxImagePtr(val); val.thisown = 1 return val def wxImageFromStreamMime(*_args, **_kwargs): - val = apply(imagec.wxImageFromStreamMime,_args,_kwargs) + val = imagec.wxImageFromStreamMime(*_args,**_kwargs) if val: val = wxImagePtr(val); val.thisown = 1 return val wxInitAllImageHandlers = imagec.wxInitAllImageHandlers def wxBitmapFromImage(*_args, **_kwargs): - val = apply(imagec.wxBitmapFromImage,_args,_kwargs) + val = imagec.wxBitmapFromImage(*_args,**_kwargs) if val: val = wxBitmapPtr(val); val.thisown = 1 return val @@ -453,6 +454,8 @@ wxImage_InsertHandler = imagec.wxImage_InsertHandler wxImage_RemoveHandler = imagec.wxImage_RemoveHandler +wxImage_GetImageExtWildcard = imagec.wxImage_GetImageExtWildcard + #-------------- VARIABLE WRAPPERS ------------------ diff --git a/wxPython/src/msw/mdi.py b/wxPython/src/msw/mdi.py index cbb13f73c9..b4827d3369 100644 --- a/wxPython/src/msw/mdi.py +++ b/wxPython/src/msw/mdi.py @@ -24,53 +24,53 @@ class wxMDIParentFramePtr(wxFramePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_Create,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_Create(self, *_args, **_kwargs) return val def ActivateNext(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_ActivateNext,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_ActivateNext(self, *_args, **_kwargs) return val def ActivatePrevious(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_ActivatePrevious,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_ActivatePrevious(self, *_args, **_kwargs) return val def ArrangeIcons(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_ArrangeIcons,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_ArrangeIcons(self, *_args, **_kwargs) return val def Cascade(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_Cascade,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_Cascade(self, *_args, **_kwargs) return val def GetActiveChild(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_GetActiveChild,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_GetActiveChild(self, *_args, **_kwargs) return val def GetClientWindow(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_GetClientWindow,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_GetClientWindow(self, *_args, **_kwargs) return val def GetToolBar(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_GetToolBar,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_GetToolBar(self, *_args, **_kwargs) return val def GetWindowMenu(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_GetWindowMenu,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_GetWindowMenu(self, *_args, **_kwargs) return val def SetWindowMenu(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_SetWindowMenu,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_SetWindowMenu(self, *_args, **_kwargs) return val def SetToolBar(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_SetToolBar,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_SetToolBar(self, *_args, **_kwargs) return val def Tile(self, *_args, **_kwargs): - val = apply(mdic.wxMDIParentFrame_Tile,(self,) + _args, _kwargs) + val = mdic.wxMDIParentFrame_Tile(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMDIParentFrame(wxMDIParentFramePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(mdic.new_wxMDIParentFrame,_args,_kwargs) + self.this = mdic.new_wxMDIParentFrame(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreMDIParentFrame(*_args,**_kwargs): - val = wxMDIParentFramePtr(apply(mdic.new_wxPreMDIParentFrame,_args,_kwargs)) + val = wxMDIParentFramePtr(mdic.new_wxPreMDIParentFrame(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -81,29 +81,29 @@ class wxMDIChildFramePtr(wxFramePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(mdic.wxMDIChildFrame_Create,(self,) + _args, _kwargs) + val = mdic.wxMDIChildFrame_Create(self, *_args, **_kwargs) return val def Activate(self, *_args, **_kwargs): - val = apply(mdic.wxMDIChildFrame_Activate,(self,) + _args, _kwargs) + val = mdic.wxMDIChildFrame_Activate(self, *_args, **_kwargs) return val def Maximize(self, *_args, **_kwargs): - val = apply(mdic.wxMDIChildFrame_Maximize,(self,) + _args, _kwargs) + val = mdic.wxMDIChildFrame_Maximize(self, *_args, **_kwargs) return val def Restore(self, *_args, **_kwargs): - val = apply(mdic.wxMDIChildFrame_Restore,(self,) + _args, _kwargs) + val = mdic.wxMDIChildFrame_Restore(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMDIChildFrame(wxMDIChildFramePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(mdic.new_wxMDIChildFrame,_args,_kwargs) + self.this = mdic.new_wxMDIChildFrame(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreMDIChildFrame(*_args,**_kwargs): - val = wxMDIChildFramePtr(apply(mdic.new_wxPreMDIChildFrame,_args,_kwargs)) + val = wxMDIChildFramePtr(mdic.new_wxPreMDIChildFrame(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -114,20 +114,20 @@ class wxMDIClientWindowPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(mdic.wxMDIClientWindow_Create,(self,) + _args, _kwargs) + val = mdic.wxMDIClientWindow_Create(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMDIClientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMDIClientWindow(wxMDIClientWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(mdic.new_wxMDIClientWindow,_args,_kwargs) + self.this = mdic.new_wxMDIClientWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreMDIClientWindow(*_args,**_kwargs): - val = wxMDIClientWindowPtr(apply(mdic.new_wxPreMDIClientWindow,_args,_kwargs)) + val = wxMDIClientWindowPtr(mdic.new_wxPreMDIClientWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val diff --git a/wxPython/src/msw/misc.cpp b/wxPython/src/msw/misc.cpp index 4fcae32416..c9bd1db2f8 100644 --- a/wxPython/src/msw/misc.cpp +++ b/wxPython/src/msw/misc.cpp @@ -55,7 +55,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "miscc" #include "helpers.h" -#include #include #include #include @@ -1332,6 +1331,76 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args, PyObject return _resultobj; } +#define wxSize_IncTo(_swigobj,_swigarg0) (_swigobj->IncTo(_swigarg0)) +static PyObject *_wrap_wxSize_IncTo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _arg0; + wxSize * _arg1; + wxSize temp; + PyObject * _obj0 = 0; + wxSize temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","sz", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSize_IncTo",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSize_IncTo(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSize_DecTo(_swigobj,_swigarg0) (_swigobj->DecTo(_swigarg0)) +static PyObject *_wrap_wxSize_DecTo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _arg0; + wxSize * _arg1; + wxSize temp; + PyObject * _obj0 = 0; + wxSize temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","sz", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSize_DecTo",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSize_DecTo(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyObject * wxSize_asTuple(wxSize *self) { wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); @@ -5513,6 +5582,8 @@ static PyMethodDef misccMethods[] = { { "wxSize___ne__", (PyCFunction) _wrap_wxSize___ne__, METH_VARARGS | METH_KEYWORDS }, { "wxSize___eq__", (PyCFunction) _wrap_wxSize___eq__, METH_VARARGS | METH_KEYWORDS }, { "wxSize_asTuple", (PyCFunction) _wrap_wxSize_asTuple, METH_VARARGS | METH_KEYWORDS }, + { "wxSize_DecTo", (PyCFunction) _wrap_wxSize_DecTo, METH_VARARGS | METH_KEYWORDS }, + { "wxSize_IncTo", (PyCFunction) _wrap_wxSize_IncTo, METH_VARARGS | METH_KEYWORDS }, { "wxSize_SetHeight", (PyCFunction) _wrap_wxSize_SetHeight, METH_VARARGS | METH_KEYWORDS }, { "wxSize_SetWidth", (PyCFunction) _wrap_wxSize_SetWidth, METH_VARARGS | METH_KEYWORDS }, { "wxSize_GetHeight", (PyCFunction) _wrap_wxSize_GetHeight, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/misc.py b/wxPython/src/msw/misc.py index 892e56dcf7..f0b023e3a8 100644 --- a/wxPython/src/msw/misc.py +++ b/wxPython/src/msw/misc.py @@ -5,13 +5,13 @@ class wxObjectPtr : self.this = this self.thisown = 0 def GetClassName(self, *_args, **_kwargs): - val = apply(miscc.wxObject_GetClassName,(self,) + _args, _kwargs) + val = miscc.wxObject_GetClassName(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(miscc.wxObject_Destroy,(self,) + _args, _kwargs) + val = miscc.wxObject_Destroy(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxObject(wxObjectPtr): def __init__(self,this): self.this = this @@ -30,34 +30,40 @@ class wxSizePtr : except: pass def Set(self, *_args, **_kwargs): - val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs) + val = miscc.wxSize_Set(self, *_args, **_kwargs) return val def GetX(self, *_args, **_kwargs): - val = apply(miscc.wxSize_GetX,(self,) + _args, _kwargs) + val = miscc.wxSize_GetX(self, *_args, **_kwargs) return val def GetY(self, *_args, **_kwargs): - val = apply(miscc.wxSize_GetY,(self,) + _args, _kwargs) + val = miscc.wxSize_GetY(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(miscc.wxSize_GetWidth,(self,) + _args, _kwargs) + val = miscc.wxSize_GetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(miscc.wxSize_GetHeight,(self,) + _args, _kwargs) + val = miscc.wxSize_GetHeight(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(miscc.wxSize_SetWidth,(self,) + _args, _kwargs) + val = miscc.wxSize_SetWidth(self, *_args, **_kwargs) return val def SetHeight(self, *_args, **_kwargs): - val = apply(miscc.wxSize_SetHeight,(self,) + _args, _kwargs) + val = miscc.wxSize_SetHeight(self, *_args, **_kwargs) + return val + def IncTo(self, *_args, **_kwargs): + val = miscc.wxSize_IncTo(self, *_args, **_kwargs) + return val + def DecTo(self, *_args, **_kwargs): + val = miscc.wxSize_DecTo(self, *_args, **_kwargs) return val def asTuple(self, *_args, **_kwargs): - val = apply(miscc.wxSize_asTuple,(self,) + _args, _kwargs) + val = miscc.wxSize_asTuple(self, *_args, **_kwargs) return val def __eq__(self, *_args, **_kwargs): - val = apply(miscc.wxSize___eq__,(self,) + _args, _kwargs) + val = miscc.wxSize___eq__(self, *_args, **_kwargs) return val def __ne__(self, *_args, **_kwargs): - val = apply(miscc.wxSize___ne__,(self,) + _args, _kwargs) + val = miscc.wxSize___ne__(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "x" : @@ -84,7 +90,7 @@ class wxSizePtr : return miscc.wxSize_height_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSize instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def __str__(self): return str(self.asTuple()) def __repr__(self): return 'wxSize'+str(self.asTuple()) @@ -101,7 +107,7 @@ class wxSizePtr : class wxSize(wxSizePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxSize,_args,_kwargs) + self.this = miscc.new_wxSize(*_args,**_kwargs) self.thisown = 1 @@ -118,24 +124,24 @@ class wxRealPointPtr : except: pass def Set(self, *_args, **_kwargs): - val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs) + val = miscc.wxRealPoint_Set(self, *_args, **_kwargs) return val def asTuple(self, *_args, **_kwargs): - val = apply(miscc.wxRealPoint_asTuple,(self,) + _args, _kwargs) + val = miscc.wxRealPoint_asTuple(self, *_args, **_kwargs) return val def __add__(self, *_args, **_kwargs): - val = apply(miscc.wxRealPoint___add__,(self,) + _args, _kwargs) + val = miscc.wxRealPoint___add__(self, *_args, **_kwargs) if val: val = wxRealPointPtr(val) ; val.thisown = 1 return val def __sub__(self, *_args, **_kwargs): - val = apply(miscc.wxRealPoint___sub__,(self,) + _args, _kwargs) + val = miscc.wxRealPoint___sub__(self, *_args, **_kwargs) if val: val = wxRealPointPtr(val) ; val.thisown = 1 return val def __eq__(self, *_args, **_kwargs): - val = apply(miscc.wxRealPoint___eq__,(self,) + _args, _kwargs) + val = miscc.wxRealPoint___eq__(self, *_args, **_kwargs) return val def __ne__(self, *_args, **_kwargs): - val = apply(miscc.wxRealPoint___ne__,(self,) + _args, _kwargs) + val = miscc.wxRealPoint___ne__(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "x" : @@ -152,7 +158,7 @@ class wxRealPointPtr : return miscc.wxRealPoint_y_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxRealPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def __str__(self): return str(self.asTuple()) def __repr__(self): return 'wxRealPoint'+str(self.asTuple()) @@ -169,7 +175,7 @@ class wxRealPointPtr : class wxRealPoint(wxRealPointPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxRealPoint,_args,_kwargs) + self.this = miscc.new_wxRealPoint(*_args,**_kwargs) self.thisown = 1 @@ -186,24 +192,24 @@ class wxPointPtr : except: pass def Set(self, *_args, **_kwargs): - val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs) + val = miscc.wxPoint_Set(self, *_args, **_kwargs) return val def asTuple(self, *_args, **_kwargs): - val = apply(miscc.wxPoint_asTuple,(self,) + _args, _kwargs) + val = miscc.wxPoint_asTuple(self, *_args, **_kwargs) return val def __add__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint___add__,(self,) + _args, _kwargs) + val = miscc.wxPoint___add__(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def __sub__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint___sub__,(self,) + _args, _kwargs) + val = miscc.wxPoint___sub__(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def __eq__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint___eq__,(self,) + _args, _kwargs) + val = miscc.wxPoint___eq__(self, *_args, **_kwargs) return val def __ne__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint___ne__,(self,) + _args, _kwargs) + val = miscc.wxPoint___ne__(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "x" : @@ -220,7 +226,7 @@ class wxPointPtr : return miscc.wxPoint_y_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def __str__(self): return str(self.asTuple()) def __repr__(self): return 'wxPoint'+str(self.asTuple()) @@ -237,7 +243,7 @@ class wxPointPtr : class wxPoint(wxPointPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxPoint,_args,_kwargs) + self.this = miscc.new_wxPoint(*_args,**_kwargs) self.thisown = 1 @@ -254,103 +260,103 @@ class wxRectPtr : except: pass def GetX(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs) + val = miscc.wxRect_GetX(self, *_args, **_kwargs) return val def SetX(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetX,(self,) + _args, _kwargs) + val = miscc.wxRect_SetX(self, *_args, **_kwargs) return val def GetY(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetY,(self,) + _args, _kwargs) + val = miscc.wxRect_GetY(self, *_args, **_kwargs) return val def SetY(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetY,(self,) + _args, _kwargs) + val = miscc.wxRect_SetY(self, *_args, **_kwargs) return val def GetWidth(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetWidth,(self,) + _args, _kwargs) + val = miscc.wxRect_GetWidth(self, *_args, **_kwargs) return val def SetWidth(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetWidth,(self,) + _args, _kwargs) + val = miscc.wxRect_SetWidth(self, *_args, **_kwargs) return val def GetHeight(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetHeight,(self,) + _args, _kwargs) + val = miscc.wxRect_GetHeight(self, *_args, **_kwargs) return val def SetHeight(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetHeight,(self,) + _args, _kwargs) + val = miscc.wxRect_SetHeight(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetPosition,(self,) + _args, _kwargs) + val = miscc.wxRect_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetSize(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetSize,(self,) + _args, _kwargs) + val = miscc.wxRect_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetPosition(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetPosition,(self,) + _args, _kwargs) + val = miscc.wxRect_SetPosition(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetSize,(self,) + _args, _kwargs) + val = miscc.wxRect_SetSize(self, *_args, **_kwargs) return val def GetLeft(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetLeft,(self,) + _args, _kwargs) + val = miscc.wxRect_GetLeft(self, *_args, **_kwargs) return val def GetTop(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetTop,(self,) + _args, _kwargs) + val = miscc.wxRect_GetTop(self, *_args, **_kwargs) return val def GetBottom(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetBottom,(self,) + _args, _kwargs) + val = miscc.wxRect_GetBottom(self, *_args, **_kwargs) return val def GetRight(self, *_args, **_kwargs): - val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs) + val = miscc.wxRect_GetRight(self, *_args, **_kwargs) return val def SetLeft(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetLeft,(self,) + _args, _kwargs) + val = miscc.wxRect_SetLeft(self, *_args, **_kwargs) return val def SetRight(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetRight,(self,) + _args, _kwargs) + val = miscc.wxRect_SetRight(self, *_args, **_kwargs) return val def SetTop(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetTop,(self,) + _args, _kwargs) + val = miscc.wxRect_SetTop(self, *_args, **_kwargs) return val def SetBottom(self, *_args, **_kwargs): - val = apply(miscc.wxRect_SetBottom,(self,) + _args, _kwargs) + val = miscc.wxRect_SetBottom(self, *_args, **_kwargs) return val def Deflate(self, *_args, **_kwargs): - val = apply(miscc.wxRect_Deflate,(self,) + _args, _kwargs) + val = miscc.wxRect_Deflate(self, *_args, **_kwargs) return val def Inflate(self, *_args, **_kwargs): - val = apply(miscc.wxRect_Inflate,(self,) + _args, _kwargs) + val = miscc.wxRect_Inflate(self, *_args, **_kwargs) return val def InsideXY(self, *_args, **_kwargs): - val = apply(miscc.wxRect_InsideXY,(self,) + _args, _kwargs) + val = miscc.wxRect_InsideXY(self, *_args, **_kwargs) return val def Inside(self, *_args, **_kwargs): - val = apply(miscc.wxRect_Inside,(self,) + _args, _kwargs) + val = miscc.wxRect_Inside(self, *_args, **_kwargs) return val def Intersects(self, *_args, **_kwargs): - val = apply(miscc.wxRect_Intersects,(self,) + _args, _kwargs) + val = miscc.wxRect_Intersects(self, *_args, **_kwargs) return val def OffsetXY(self, *_args, **_kwargs): - val = apply(miscc.wxRect_OffsetXY,(self,) + _args, _kwargs) + val = miscc.wxRect_OffsetXY(self, *_args, **_kwargs) return val def Offset(self, *_args, **_kwargs): - val = apply(miscc.wxRect_Offset,(self,) + _args, _kwargs) + val = miscc.wxRect_Offset(self, *_args, **_kwargs) return val def Set(self, *_args, **_kwargs): - val = apply(miscc.wxRect_Set,(self,) + _args, _kwargs) + val = miscc.wxRect_Set(self, *_args, **_kwargs) return val def asTuple(self, *_args, **_kwargs): - val = apply(miscc.wxRect_asTuple,(self,) + _args, _kwargs) + val = miscc.wxRect_asTuple(self, *_args, **_kwargs) return val def __add__(self, *_args, **_kwargs): - val = apply(miscc.wxRect___add__,(self,) + _args, _kwargs) + val = miscc.wxRect___add__(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def __eq__(self, *_args, **_kwargs): - val = apply(miscc.wxRect___eq__,(self,) + _args, _kwargs) + val = miscc.wxRect___eq__(self, *_args, **_kwargs) return val def __ne__(self, *_args, **_kwargs): - val = apply(miscc.wxRect___ne__,(self,) + _args, _kwargs) + val = miscc.wxRect___ne__(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "x" : @@ -377,7 +383,7 @@ class wxRectPtr : return miscc.wxRect_height_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxRect instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def __str__(self): return str(self.asTuple()) def __repr__(self): return 'wxRect'+str(self.asTuple()) @@ -433,7 +439,7 @@ class wxRectPtr : class wxRect(wxRectPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxRect,_args,_kwargs) + self.this = miscc.new_wxRect(*_args,**_kwargs) self.thisown = 1 @@ -444,66 +450,66 @@ class wxPoint2DDoublePtr : self.this = this self.thisown = 0 def GetFloor(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetFloor,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetFloor(self, *_args, **_kwargs) return val def GetRounded(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetRounded,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetRounded(self, *_args, **_kwargs) return val def GetVectorLength(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetVectorLength,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetVectorLength(self, *_args, **_kwargs) return val def GetVectorAngle(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetVectorAngle,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetVectorAngle(self, *_args, **_kwargs) return val def SetVectorLength(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_SetVectorLength,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_SetVectorLength(self, *_args, **_kwargs) return val def SetVectorAngle(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_SetVectorAngle,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_SetVectorAngle(self, *_args, **_kwargs) return val def GetDistance(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetDistance,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetDistance(self, *_args, **_kwargs) return val def GetDistanceSquare(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetDistanceSquare,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetDistanceSquare(self, *_args, **_kwargs) return val def GetDotProduct(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetDotProduct,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetDotProduct(self, *_args, **_kwargs) return val def GetCrossProduct(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_GetCrossProduct,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_GetCrossProduct(self, *_args, **_kwargs) return val def Set(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_Set,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_Set(self, *_args, **_kwargs) return val def __neg__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble___neg__,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble___neg__(self, *_args, **_kwargs) if val: val = wxPoint2DDoublePtr(val) ; val.thisown = 1 return val def __iadd__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble___iadd__,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble___iadd__(self, *_args, **_kwargs) if val: val = wxPoint2DDoublePtr(val) return val def __isub__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble___isub__,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble___isub__(self, *_args, **_kwargs) if val: val = wxPoint2DDoublePtr(val) return val def __imul__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble___imul__,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble___imul__(self, *_args, **_kwargs) if val: val = wxPoint2DDoublePtr(val) return val def __idiv__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble___idiv__,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble___idiv__(self, *_args, **_kwargs) if val: val = wxPoint2DDoublePtr(val) return val def __eq__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble___eq__,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble___eq__(self, *_args, **_kwargs) return val def __ne__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble___ne__,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble___ne__(self, *_args, **_kwargs) return val def asTuple(self, *_args, **_kwargs): - val = apply(miscc.wxPoint2DDouble_asTuple,(self,) + _args, _kwargs) + val = miscc.wxPoint2DDouble_asTuple(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "m_x" : @@ -530,7 +536,7 @@ class wxPoint2DDoublePtr : return miscc.wxPoint2DDouble_y_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPoint2DDouble instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def SetPolarCoordinates(self, angle, length): self.SetVectorLength(length) @@ -554,18 +560,18 @@ class wxPoint2DDoublePtr : class wxPoint2DDouble(wxPoint2DDoublePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxPoint2DDouble,_args,_kwargs) + self.this = miscc.new_wxPoint2DDouble(*_args,**_kwargs) self.thisown = 1 def wxPoint2DDoubleCopy(*_args,**_kwargs): - val = wxPoint2DDoublePtr(apply(miscc.new_wxPoint2DDoubleCopy,_args,_kwargs)) + val = wxPoint2DDoublePtr(miscc.new_wxPoint2DDoubleCopy(*_args,**_kwargs)) val.thisown = 1 return val def wxPoint2DDoubleFromPoint(*_args,**_kwargs): - val = wxPoint2DDoublePtr(apply(miscc.new_wxPoint2DDoubleFromPoint,_args,_kwargs)) + val = wxPoint2DDoublePtr(miscc.new_wxPoint2DDoubleFromPoint(*_args,**_kwargs)) val.thisown = 1 return val @@ -575,37 +581,37 @@ class wxIndividualLayoutConstraintPtr(wxObjectPtr): self.this = this self.thisown = 0 def Above(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_Above,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_Above(self, *_args, **_kwargs) return val def Absolute(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_Absolute,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_Absolute(self, *_args, **_kwargs) return val def AsIs(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_AsIs,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_AsIs(self, *_args, **_kwargs) return val def Below(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_Below,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_Below(self, *_args, **_kwargs) return val def Unconstrained(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_Unconstrained,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_Unconstrained(self, *_args, **_kwargs) return val def LeftOf(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_LeftOf,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_LeftOf(self, *_args, **_kwargs) return val def PercentOf(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_PercentOf,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_PercentOf(self, *_args, **_kwargs) return val def RightOf(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_RightOf,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_RightOf(self, *_args, **_kwargs) return val def SameAs(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_SameAs,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_SameAs(self, *_args, **_kwargs) return val def Set(self, *_args, **_kwargs): - val = apply(miscc.wxIndividualLayoutConstraint_Set,(self,) + _args, _kwargs) + val = miscc.wxIndividualLayoutConstraint_Set(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxIndividualLayoutConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr): def __init__(self,this): self.this = this @@ -662,10 +668,10 @@ class wxLayoutConstraintsPtr(wxObjectPtr): return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self)) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLayoutConstraints instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLayoutConstraints(wxLayoutConstraintsPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxLayoutConstraints,_args,_kwargs) + self.this = miscc.new_wxLayoutConstraints(*_args,**_kwargs) self.thisown = 1 @@ -682,22 +688,22 @@ class wxAcceleratorEntryPtr : except: pass def Set(self, *_args, **_kwargs): - val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs) + val = miscc.wxAcceleratorEntry_Set(self, *_args, **_kwargs) return val def GetFlags(self, *_args, **_kwargs): - val = apply(miscc.wxAcceleratorEntry_GetFlags,(self,) + _args, _kwargs) + val = miscc.wxAcceleratorEntry_GetFlags(self, *_args, **_kwargs) return val def GetKeyCode(self, *_args, **_kwargs): - val = apply(miscc.wxAcceleratorEntry_GetKeyCode,(self,) + _args, _kwargs) + val = miscc.wxAcceleratorEntry_GetKeyCode(self, *_args, **_kwargs) return val def GetCommand(self, *_args, **_kwargs): - val = apply(miscc.wxAcceleratorEntry_GetCommand,(self,) + _args, _kwargs) + val = miscc.wxAcceleratorEntry_GetCommand(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxAcceleratorEntry instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxAcceleratorEntry(wxAcceleratorEntryPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxAcceleratorEntry,_args,_kwargs) + self.this = miscc.new_wxAcceleratorEntry(*_args,**_kwargs) self.thisown = 1 @@ -714,10 +720,10 @@ class wxAcceleratorTablePtr(wxObjectPtr): except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxAcceleratorTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxAcceleratorTable(wxAcceleratorTablePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxAcceleratorTable,_args,_kwargs) + self.this = miscc.new_wxAcceleratorTable(*_args,**_kwargs) self.thisown = 1 @@ -734,10 +740,10 @@ class wxBusyInfoPtr(wxObjectPtr): except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBusyInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBusyInfo(wxBusyInfoPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(miscc.new_wxBusyInfo,_args,_kwargs) + self.this = miscc.new_wxBusyInfo(*_args,**_kwargs) self.thisown = 1 @@ -808,7 +814,7 @@ wxGetUserHome = miscc.wxGetUserHome wxGetProcessId = miscc.wxGetProcessId def wxGetAccelFromString(*_args, **_kwargs): - val = apply(miscc.wxGetAccelFromString,_args,_kwargs) + val = miscc.wxGetAccelFromString(*_args,**_kwargs) if val: val = wxAcceleratorEntryPtr(val) return val diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp index fce7e153a8..24cd2b5e94 100644 --- a/wxPython/src/msw/misc2.cpp +++ b/wxPython/src/msw/misc2.cpp @@ -56,7 +56,6 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include "pyistream.h" -#include #include #include #include @@ -73,7 +72,7 @@ extern PyObject *SWIG_newvarlink(void); #include #include #include -//#include +#include static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -2465,6 +2464,206 @@ static PyObject *_wrap_wxSystemSettings_SetScreenType(PyObject *self, PyObject * return _resultobj; } +static void *SwigwxSystemOptionsTowxObject(void *ptr) { + wxSystemOptions *src; + wxObject *dest; + src = (wxSystemOptions *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxSystemOptions() (new wxSystemOptions()) +static PyObject *_wrap_new_wxSystemOptions(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSystemOptions * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxSystemOptions",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxSystemOptions *)new_wxSystemOptions(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxSystemOptions_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static PyObject *_wrap_wxSystemOptions_SetOption(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _arg0; + wxString * _arg1; + PyObject * _obj0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "name","value", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSystemOptions_SetOption",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSystemOptions::SetOption(*_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj0) + delete _arg0; +} +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +static PyObject *_wrap_wxSystemOptions_SetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _arg0; + int _arg1; + PyObject * _obj0 = 0; + char *_kwnames[] = { "name","value", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSystemOptions_SetOptionInt",_kwnames,&_obj0,&_arg1)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSystemOptions::SetOption(*_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +static PyObject *_wrap_wxSystemOptions_GetOption(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "name", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSystemOptions_GetOption",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxString (wxSystemOptions::GetOption(*_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + if (_obj0) + delete _arg0; +} +{ + delete _result; +} + return _resultobj; +} + +static PyObject *_wrap_wxSystemOptions_GetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "name", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSystemOptions_GetOptionInt",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxSystemOptions::GetOptionInt(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +static PyObject *_wrap_wxSystemOptions_HasOption(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "name", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSystemOptions_HasOption",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxSystemOptions::HasOption(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + static void *SwigwxToolTipTowxObject(void *ptr) { wxToolTip *src; wxObject *dest; @@ -4338,6 +4537,7 @@ static PyObject *_wrap_wxPyTimer_SetOwner(PyObject *self, PyObject *args, PyObje #define wxPyTimer_Start(_swigobj,_swigarg0,_swigarg1) (_swigobj->Start(_swigarg0,_swigarg1)) static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + bool _result; wxPyTimer * _arg0; int _arg1 = (int ) -1; int _arg2 = (int ) FALSE; @@ -4356,12 +4556,11 @@ static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPyTimer_Start(_arg0,_arg1,_arg2); + _result = (bool )wxPyTimer_Start(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -8656,9 +8855,9 @@ static PyObject *_wrap_wxFileType_GetExtensions(PyObject *self, PyObject *args, } static wxIcon * wxFileType_GetIcon(wxFileType *self) { - wxIcon icon; - if (self->GetIcon(&icon)) - return new wxIcon(icon); + wxIconLocation loc; + if (self->GetIcon(&loc)) + return new wxIcon(loc); else return NULL; } @@ -8697,14 +8896,18 @@ static PyObject *_wrap_wxFileType_GetIcon(PyObject *self, PyObject *args, PyObje } static PyObject * wxFileType_GetIconInfo(wxFileType *self) { - wxIcon icon; - wxString iconFile; - int iconIndex; - if (self->GetIcon(&icon, &iconFile, &iconIndex)) { + wxIconLocation loc; + if (self->GetIcon(&loc)) { + wxString iconFile = loc.GetFileName(); + int iconIndex = -1; +#ifdef __WXMSW__ + iconIndex = loc.GetIndex(); +#endif + // Make a tuple and put the values in it wxPyBeginBlockThreads(); PyObject* tuple = PyTuple_New(3); - PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon), - wxT("wxIcon"), TRUE)); + PyTuple_SetItem(tuple, 0, + wxPyConstructObject(new wxIcon(loc), wxT("wxIcon"), TRUE)); #if wxUSE_UNICODE PyTuple_SetItem(tuple, 1, PyUnicode_FromWideChar(iconFile.c_str(), iconFile.Len())); #else @@ -10345,34 +10548,6 @@ static PyObject *_wrap_wxFileHistory_GetCount(PyObject *self, PyObject *args, Py return _resultobj; } -#define wxFileHistory_GetNoHistoryFiles(_swigobj) (_swigobj->GetNoHistoryFiles()) -static PyObject *_wrap_wxFileHistory_GetNoHistoryFiles(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxFileHistory * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileHistory_GetNoHistoryFiles",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileHistory_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileHistory_GetNoHistoryFiles. Expected _wxFileHistory_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxFileHistory_GetNoHistoryFiles(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static void *SwigwxEffectsTowxObject(void *ptr) { wxEffects *src; wxObject *dest; @@ -11104,7 +11279,6 @@ static PyMethodDef misc2cMethods[] = { { "wxEffects_GetLightShadow", (PyCFunction) _wrap_wxEffects_GetLightShadow, METH_VARARGS | METH_KEYWORDS }, { "wxEffects_GetHighlightColour", (PyCFunction) _wrap_wxEffects_GetHighlightColour, METH_VARARGS | METH_KEYWORDS }, { "new_wxEffects", (PyCFunction) _wrap_new_wxEffects, METH_VARARGS | METH_KEYWORDS }, - { "wxFileHistory_GetNoHistoryFiles", (PyCFunction) _wrap_wxFileHistory_GetNoHistoryFiles, METH_VARARGS | METH_KEYWORDS }, { "wxFileHistory_GetCount", (PyCFunction) _wrap_wxFileHistory_GetCount, METH_VARARGS | METH_KEYWORDS }, { "wxFileHistory_GetHistoryFile", (PyCFunction) _wrap_wxFileHistory_GetHistoryFile, METH_VARARGS | METH_KEYWORDS }, { "wxFileHistory_AddFilesToThisMenu", (PyCFunction) _wrap_wxFileHistory_AddFilesToThisMenu, METH_VARARGS | METH_KEYWORDS }, @@ -11346,6 +11520,12 @@ static PyMethodDef misc2cMethods[] = { { "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS }, { "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS }, { "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS }, + { "wxSystemOptions_HasOption", (PyCFunction) _wrap_wxSystemOptions_HasOption, METH_VARARGS | METH_KEYWORDS }, + { "wxSystemOptions_GetOptionInt", (PyCFunction) _wrap_wxSystemOptions_GetOptionInt, METH_VARARGS | METH_KEYWORDS }, + { "wxSystemOptions_GetOption", (PyCFunction) _wrap_wxSystemOptions_GetOption, METH_VARARGS | METH_KEYWORDS }, + { "wxSystemOptions_SetOptionInt", (PyCFunction) _wrap_wxSystemOptions_SetOptionInt, METH_VARARGS | METH_KEYWORDS }, + { "wxSystemOptions_SetOption", (PyCFunction) _wrap_wxSystemOptions_SetOption, METH_VARARGS | METH_KEYWORDS }, + { "new_wxSystemOptions", (PyCFunction) _wrap_new_wxSystemOptions, METH_VARARGS | METH_KEYWORDS }, { "wxSystemSettings_SetScreenType", (PyCFunction) _wrap_wxSystemSettings_SetScreenType, METH_VARARGS | METH_KEYWORDS }, { "wxSystemSettings_GetScreenType", (PyCFunction) _wrap_wxSystemSettings_GetScreenType, METH_VARARGS | METH_KEYWORDS }, { "wxSystemSettings_HasFeature", (PyCFunction) _wrap_wxSystemSettings_HasFeature, METH_VARARGS | METH_KEYWORDS }, @@ -11484,6 +11664,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxObject","_wxPyTimer",SwigwxPyTimerTowxObject}, { "_wxObject","_wxGenericDragImage",SwigwxGenericDragImageTowxObject}, { "_wxObject","_wxToolTip",SwigwxToolTipTowxObject}, + { "_wxObject","_wxSystemOptions",SwigwxSystemOptionsTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_unsigned_char","_byte",0}, diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py index 317cd38ba3..d08fcf5b73 100644 --- a/wxPython/src/msw/misc2.py +++ b/wxPython/src/msw/misc2.py @@ -64,7 +64,7 @@ class wxSystemSettingsPtr : self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSystemSettings(wxSystemSettingsPtr): def __init__(self,this): self.this = this @@ -72,24 +72,38 @@ class wxSystemSettings(wxSystemSettingsPtr): +class wxSystemOptionsPtr(wxObjectPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxSystemOptions(wxSystemOptionsPtr): + def __init__(self,*_args,**_kwargs): + self.this = misc2c.new_wxSystemOptions(*_args,**_kwargs) + self.thisown = 1 + + + + class wxToolTipPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 def SetTip(self, *_args, **_kwargs): - val = apply(misc2c.wxToolTip_SetTip,(self,) + _args, _kwargs) + val = misc2c.wxToolTip_SetTip(self, *_args, **_kwargs) return val def GetTip(self, *_args, **_kwargs): - val = apply(misc2c.wxToolTip_GetTip,(self,) + _args, _kwargs) + val = misc2c.wxToolTip_GetTip(self, *_args, **_kwargs) return val def GetWindow(self, *_args, **_kwargs): - val = apply(misc2c.wxToolTip_GetWindow,(self,) + _args, _kwargs) + val = misc2c.wxToolTip_GetWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxToolTip instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxToolTip(wxToolTipPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxToolTip,_args,_kwargs) + self.this = misc2c.new_wxToolTip(*_args,**_kwargs) self.thisown = 1 @@ -106,51 +120,52 @@ class wxCaretPtr : except: pass def IsOk(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs) + val = misc2c.wxCaret_IsOk(self, *_args, **_kwargs) return val def IsVisible(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_IsVisible,(self,) + _args, _kwargs) + val = misc2c.wxCaret_IsVisible(self, *_args, **_kwargs) return val def GetPositionTuple(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_GetPositionTuple,(self,) + _args, _kwargs) + val = misc2c.wxCaret_GetPositionTuple(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_GetPosition,(self,) + _args, _kwargs) + val = misc2c.wxCaret_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetSizeTuple(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_GetSizeTuple,(self,) + _args, _kwargs) + val = misc2c.wxCaret_GetSizeTuple(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_GetSize,(self,) + _args, _kwargs) + val = misc2c.wxCaret_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetWindow(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_GetWindow,(self,) + _args, _kwargs) + val = misc2c.wxCaret_GetWindow(self, *_args, **_kwargs) return val def MoveXY(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_MoveXY,(self,) + _args, _kwargs) + val = misc2c.wxCaret_MoveXY(self, *_args, **_kwargs) return val def Move(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_Move,(self,) + _args, _kwargs) + val = misc2c.wxCaret_Move(self, *_args, **_kwargs) return val def SetSizeWH(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_SetSizeWH,(self,) + _args, _kwargs) + val = misc2c.wxCaret_SetSizeWH(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_SetSize,(self,) + _args, _kwargs) + val = misc2c.wxCaret_SetSize(self, *_args, **_kwargs) return val def Show(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_Show,(self,) + _args, _kwargs) + val = misc2c.wxCaret_Show(self, *_args, **_kwargs) return val def Hide(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_Hide,(self,) + _args, _kwargs) + val = misc2c.wxCaret_Hide(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCaret instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.IsOk() class wxCaret(wxCaretPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxCaret,_args,_kwargs) + self.this = misc2c.new_wxCaret(*_args,**_kwargs) self.thisown = 1 @@ -167,10 +182,10 @@ class wxBusyCursorPtr : except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBusyCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBusyCursor(wxBusyCursorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxBusyCursor,_args,_kwargs) + self.this = misc2c.new_wxBusyCursor(*_args,**_kwargs) self.thisown = 1 @@ -187,10 +202,10 @@ class wxWindowDisablerPtr : except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWindowDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWindowDisabler(wxWindowDisablerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxWindowDisabler,_args,_kwargs) + self.this = misc2c.new_wxWindowDisabler(*_args,**_kwargs) self.thisown = 1 @@ -207,10 +222,10 @@ class wxMutexGuiLockerPtr : except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMutexGuiLocker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMutexGuiLocker(wxMutexGuiLockerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxMutexGuiLocker,_args,_kwargs) + self.this = misc2c.new_wxMutexGuiLocker(*_args,**_kwargs) self.thisown = 1 @@ -227,16 +242,16 @@ class wxTipProviderPtr : except: pass def GetTip(self, *_args, **_kwargs): - val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs) + val = misc2c.wxTipProvider_GetTip(self, *_args, **_kwargs) return val def GetCurrentTip(self, *_args, **_kwargs): - val = apply(misc2c.wxTipProvider_GetCurrentTip,(self,) + _args, _kwargs) + val = misc2c.wxTipProvider_GetCurrentTip(self, *_args, **_kwargs) return val def PreprocessTip(self, *_args, **_kwargs): - val = apply(misc2c.wxTipProvider_PreprocessTip,(self,) + _args, _kwargs) + val = misc2c.wxTipProvider_PreprocessTip(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTipProvider(wxTipProviderPtr): def __init__(self,this): self.this = this @@ -249,13 +264,13 @@ class wxPyTipProviderPtr(wxTipProviderPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(misc2c.wxPyTipProvider__setCallbackInfo,(self,) + _args, _kwargs) + val = misc2c.wxPyTipProvider__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyTipProvider(wxPyTipProviderPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxPyTipProvider,_args,_kwargs) + self.this = misc2c.new_wxPyTipProvider(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyTipProvider) @@ -273,60 +288,60 @@ class wxDragImagePtr(wxObjectPtr): except: pass def SetBackingBitmap(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_SetBackingBitmap,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_SetBackingBitmap(self, *_args, **_kwargs) return val def BeginDrag(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_BeginDrag,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_BeginDrag(self, *_args, **_kwargs) return val def BeginDragBounded(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_BeginDragBounded,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_BeginDragBounded(self, *_args, **_kwargs) return val def EndDrag(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_EndDrag,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_EndDrag(self, *_args, **_kwargs) return val def Move(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_Move,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_Move(self, *_args, **_kwargs) return val def Show(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_Show,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_Show(self, *_args, **_kwargs) return val def Hide(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_Hide,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_Hide(self, *_args, **_kwargs) return val def GetImageRect(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_GetImageRect,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_GetImageRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def RedrawImage(self, *_args, **_kwargs): - val = apply(misc2c.wxDragImage_RedrawImage,(self,) + _args, _kwargs) + val = misc2c.wxDragImage_RedrawImage(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDragImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) BeginDrag2 = BeginDragBounded class wxDragImage(wxDragImagePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxDragImage,_args,_kwargs) + self.this = misc2c.new_wxDragImage(*_args,**_kwargs) self.thisown = 1 def wxDragIcon(*_args,**_kwargs): - val = wxDragImagePtr(apply(misc2c.new_wxDragIcon,_args,_kwargs)) + val = wxDragImagePtr(misc2c.new_wxDragIcon(*_args,**_kwargs)) val.thisown = 1 return val def wxDragString(*_args,**_kwargs): - val = wxDragImagePtr(apply(misc2c.new_wxDragString,_args,_kwargs)) + val = wxDragImagePtr(misc2c.new_wxDragString(*_args,**_kwargs)) val.thisown = 1 return val def wxDragTreeItem(*_args,**_kwargs): - val = wxDragImagePtr(apply(misc2c.new_wxDragTreeItem,_args,_kwargs)) + val = wxDragImagePtr(misc2c.new_wxDragTreeItem(*_args,**_kwargs)) val.thisown = 1 return val def wxDragListItem(*_args,**_kwargs): - val = wxDragImagePtr(apply(misc2c.new_wxDragListItem,_args,_kwargs)) + val = wxDragImagePtr(misc2c.new_wxDragListItem(*_args,**_kwargs)) val.thisown = 1 return val @@ -342,28 +357,28 @@ class wxPyTimerPtr(wxObjectPtr): except: pass def GetInterval(self, *_args, **_kwargs): - val = apply(misc2c.wxPyTimer_GetInterval,(self,) + _args, _kwargs) + val = misc2c.wxPyTimer_GetInterval(self, *_args, **_kwargs) return val def IsOneShot(self, *_args, **_kwargs): - val = apply(misc2c.wxPyTimer_IsOneShot,(self,) + _args, _kwargs) + val = misc2c.wxPyTimer_IsOneShot(self, *_args, **_kwargs) return val def IsRunning(self, *_args, **_kwargs): - val = apply(misc2c.wxPyTimer_IsRunning,(self,) + _args, _kwargs) + val = misc2c.wxPyTimer_IsRunning(self, *_args, **_kwargs) return val def SetOwner(self, *_args, **_kwargs): - val = apply(misc2c.wxPyTimer_SetOwner,(self,) + _args, _kwargs) + val = misc2c.wxPyTimer_SetOwner(self, *_args, **_kwargs) return val def Start(self, *_args, **_kwargs): - val = apply(misc2c.wxPyTimer_Start,(self,) + _args, _kwargs) + val = misc2c.wxPyTimer_Start(self, *_args, **_kwargs) return val def Stop(self, *_args, **_kwargs): - val = apply(misc2c.wxPyTimer_Stop,(self,) + _args, _kwargs) + val = misc2c.wxPyTimer_Stop(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyTimer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyTimer(wxPyTimerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxPyTimer,_args,_kwargs) + self.this = misc2c.new_wxPyTimer(*_args,**_kwargs) self.thisown = 1 @@ -380,22 +395,22 @@ class wxStopWatchPtr : except: pass def Start(self, *_args, **_kwargs): - val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs) + val = misc2c.wxStopWatch_Start(self, *_args, **_kwargs) return val def Pause(self, *_args, **_kwargs): - val = apply(misc2c.wxStopWatch_Pause,(self,) + _args, _kwargs) + val = misc2c.wxStopWatch_Pause(self, *_args, **_kwargs) return val def Resume(self, *_args, **_kwargs): - val = apply(misc2c.wxStopWatch_Resume,(self,) + _args, _kwargs) + val = misc2c.wxStopWatch_Resume(self, *_args, **_kwargs) return val def Time(self, *_args, **_kwargs): - val = apply(misc2c.wxStopWatch_Time,(self,) + _args, _kwargs) + val = misc2c.wxStopWatch_Time(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxStopWatch instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStopWatch(wxStopWatchPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxStopWatch,_args,_kwargs) + self.this = misc2c.new_wxStopWatch(*_args,**_kwargs) self.thisown = 1 @@ -406,19 +421,19 @@ class wxLogPtr : self.this = this self.thisown = 0 def Flush(self, *_args, **_kwargs): - val = apply(misc2c.wxLog_Flush,(self,) + _args, _kwargs) + val = misc2c.wxLog_Flush(self, *_args, **_kwargs) return val def GetVerbose(self, *_args, **_kwargs): - val = apply(misc2c.wxLog_GetVerbose,(self,) + _args, _kwargs) + val = misc2c.wxLog_GetVerbose(self, *_args, **_kwargs) return val def TimeStamp(self, *_args, **_kwargs): - val = apply(misc2c.wxLog_TimeStamp,(self,) + _args, _kwargs) + val = misc2c.wxLog_TimeStamp(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLog(wxLogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxLog,_args,_kwargs) + self.this = misc2c.new_wxLog(*_args,**_kwargs) self.thisown = 1 @@ -429,10 +444,10 @@ class wxLogStderrPtr(wxLogPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLogStderr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLogStderr(wxLogStderrPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxLogStderr,_args,_kwargs) + self.this = misc2c.new_wxLogStderr(*_args,**_kwargs) self.thisown = 1 @@ -443,10 +458,10 @@ class wxLogTextCtrlPtr(wxLogPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLogTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLogTextCtrl(wxLogTextCtrlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxLogTextCtrl,_args,_kwargs) + self.this = misc2c.new_wxLogTextCtrl(*_args,**_kwargs) self.thisown = 1 @@ -457,10 +472,10 @@ class wxLogGuiPtr(wxLogPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLogGui instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLogGui(wxLogGuiPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxLogGui,_args,_kwargs) + self.this = misc2c.new_wxLogGui(*_args,**_kwargs) self.thisown = 1 @@ -471,26 +486,26 @@ class wxLogWindowPtr(wxLogPtr): self.this = this self.thisown = 0 def Show(self, *_args, **_kwargs): - val = apply(misc2c.wxLogWindow_Show,(self,) + _args, _kwargs) + val = misc2c.wxLogWindow_Show(self, *_args, **_kwargs) return val def GetFrame(self, *_args, **_kwargs): - val = apply(misc2c.wxLogWindow_GetFrame,(self,) + _args, _kwargs) + val = misc2c.wxLogWindow_GetFrame(self, *_args, **_kwargs) return val def GetOldLog(self, *_args, **_kwargs): - val = apply(misc2c.wxLogWindow_GetOldLog,(self,) + _args, _kwargs) + val = misc2c.wxLogWindow_GetOldLog(self, *_args, **_kwargs) if val: val = wxLogPtr(val) return val def IsPassingMessages(self, *_args, **_kwargs): - val = apply(misc2c.wxLogWindow_IsPassingMessages,(self,) + _args, _kwargs) + val = misc2c.wxLogWindow_IsPassingMessages(self, *_args, **_kwargs) return val def PassMessages(self, *_args, **_kwargs): - val = apply(misc2c.wxLogWindow_PassMessages,(self,) + _args, _kwargs) + val = misc2c.wxLogWindow_PassMessages(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLogWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLogWindow(wxLogWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxLogWindow,_args,_kwargs) + self.this = misc2c.new_wxLogWindow(*_args,**_kwargs) self.thisown = 1 @@ -501,23 +516,23 @@ class wxLogChainPtr(wxLogPtr): self.this = this self.thisown = 0 def SetLog(self, *_args, **_kwargs): - val = apply(misc2c.wxLogChain_SetLog,(self,) + _args, _kwargs) + val = misc2c.wxLogChain_SetLog(self, *_args, **_kwargs) return val def PassMessages(self, *_args, **_kwargs): - val = apply(misc2c.wxLogChain_PassMessages,(self,) + _args, _kwargs) + val = misc2c.wxLogChain_PassMessages(self, *_args, **_kwargs) return val def IsPassingMessages(self, *_args, **_kwargs): - val = apply(misc2c.wxLogChain_IsPassingMessages,(self,) + _args, _kwargs) + val = misc2c.wxLogChain_IsPassingMessages(self, *_args, **_kwargs) return val def GetOldLog(self, *_args, **_kwargs): - val = apply(misc2c.wxLogChain_GetOldLog,(self,) + _args, _kwargs) + val = misc2c.wxLogChain_GetOldLog(self, *_args, **_kwargs) if val: val = wxLogPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLogChain instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLogChain(wxLogChainPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxLogChain,_args,_kwargs) + self.this = misc2c.new_wxLogChain(*_args,**_kwargs) self.thisown = 1 @@ -534,10 +549,10 @@ class wxLogNullPtr : except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLogNull instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLogNull(wxLogNullPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxLogNull,_args,_kwargs) + self.this = misc2c.new_wxLogNull(*_args,**_kwargs) self.thisown = 1 @@ -548,16 +563,16 @@ class wxPyLogPtr(wxLogPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(misc2c.wxPyLog__setCallbackInfo,(self,) + _args, _kwargs) + val = misc2c.wxPyLog__setCallbackInfo(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(misc2c.wxPyLog_Destroy,(self,) + _args, _kwargs) + val = misc2c.wxPyLog_Destroy(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyLog(wxPyLogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxPyLog,_args,_kwargs) + self.this = misc2c.new_wxPyLog(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyLog) @@ -569,10 +584,10 @@ class wxProcessEventPtr(wxEventPtr): self.this = this self.thisown = 0 def GetPid(self, *_args, **_kwargs): - val = apply(misc2c.wxProcessEvent_GetPid,(self,) + _args, _kwargs) + val = misc2c.wxProcessEvent_GetPid(self, *_args, **_kwargs) return val def GetExitCode(self, *_args, **_kwargs): - val = apply(misc2c.wxProcessEvent_GetExitCode,(self,) + _args, _kwargs) + val = misc2c.wxProcessEvent_GetExitCode(self, *_args, **_kwargs) return val def __setattr__(self,name,value): if name == "m_pid" : @@ -589,10 +604,10 @@ class wxProcessEventPtr(wxEventPtr): return misc2c.wxProcessEvent_m_exitcode_get(self) raise AttributeError,name def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxProcessEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxProcessEvent(wxProcessEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxProcessEvent,_args,_kwargs) + self.this = misc2c.new_wxProcessEvent(*_args,**_kwargs) self.thisown = 1 @@ -603,50 +618,50 @@ class wxProcessPtr(wxEvtHandlerPtr): self.this = this self.thisown = 0 def Destroy(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_Destroy,(self,) + _args, _kwargs) + val = misc2c.wxProcess_Destroy(self, *_args, **_kwargs) return val def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess__setCallbackInfo,(self,) + _args, _kwargs) + val = misc2c.wxProcess__setCallbackInfo(self, *_args, **_kwargs) return val def base_OnTerminate(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_base_OnTerminate,(self,) + _args, _kwargs) + val = misc2c.wxProcess_base_OnTerminate(self, *_args, **_kwargs) return val def Redirect(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_Redirect,(self,) + _args, _kwargs) + val = misc2c.wxProcess_Redirect(self, *_args, **_kwargs) return val def IsRedirected(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_IsRedirected,(self,) + _args, _kwargs) + val = misc2c.wxProcess_IsRedirected(self, *_args, **_kwargs) return val def Detach(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_Detach,(self,) + _args, _kwargs) + val = misc2c.wxProcess_Detach(self, *_args, **_kwargs) return val def GetInputStream(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_GetInputStream,(self,) + _args, _kwargs) + val = misc2c.wxProcess_GetInputStream(self, *_args, **_kwargs) return val def GetErrorStream(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_GetErrorStream,(self,) + _args, _kwargs) + val = misc2c.wxProcess_GetErrorStream(self, *_args, **_kwargs) return val def GetOutputStream(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_GetOutputStream,(self,) + _args, _kwargs) + val = misc2c.wxProcess_GetOutputStream(self, *_args, **_kwargs) if val: val = wxOutputStreamPtr(val) return val def CloseOutput(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_CloseOutput,(self,) + _args, _kwargs) + val = misc2c.wxProcess_CloseOutput(self, *_args, **_kwargs) return val def IsInputOpened(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_IsInputOpened,(self,) + _args, _kwargs) + val = misc2c.wxProcess_IsInputOpened(self, *_args, **_kwargs) return val def IsInputAvailable(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_IsInputAvailable,(self,) + _args, _kwargs) + val = misc2c.wxProcess_IsInputAvailable(self, *_args, **_kwargs) return val def IsErrorAvailable(self, *_args, **_kwargs): - val = apply(misc2c.wxProcess_IsErrorAvailable,(self,) + _args, _kwargs) + val = misc2c.wxProcess_IsErrorAvailable(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxProcess(wxProcessPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxProcess,_args,_kwargs) + self.this = misc2c.new_wxProcess(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxProcess) @@ -664,137 +679,138 @@ class wxJoystickPtr(wxObjectPtr): except: pass def GetPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetZPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetZPosition,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetZPosition(self, *_args, **_kwargs) return val def GetButtonState(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetButtonState,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetButtonState(self, *_args, **_kwargs) return val def GetPOVPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetPOVPosition,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetPOVPosition(self, *_args, **_kwargs) return val def GetPOVCTSPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetPOVCTSPosition,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetPOVCTSPosition(self, *_args, **_kwargs) return val def GetRudderPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetRudderPosition,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetRudderPosition(self, *_args, **_kwargs) return val def GetUPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetUPosition,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetUPosition(self, *_args, **_kwargs) return val def GetVPosition(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetVPosition,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetVPosition(self, *_args, **_kwargs) return val def GetMovementThreshold(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetMovementThreshold,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetMovementThreshold(self, *_args, **_kwargs) return val def SetMovementThreshold(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_SetMovementThreshold,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_SetMovementThreshold(self, *_args, **_kwargs) return val def IsOk(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_IsOk,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_IsOk(self, *_args, **_kwargs) return val def GetNumberJoysticks(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetNumberJoysticks,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetNumberJoysticks(self, *_args, **_kwargs) return val def GetManufacturerId(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetManufacturerId,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetManufacturerId(self, *_args, **_kwargs) return val def GetProductId(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetProductId,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetProductId(self, *_args, **_kwargs) return val def GetProductName(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetProductName,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetProductName(self, *_args, **_kwargs) return val def GetXMin(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetXMin,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetXMin(self, *_args, **_kwargs) return val def GetYMin(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetYMin,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetYMin(self, *_args, **_kwargs) return val def GetZMin(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetZMin,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetZMin(self, *_args, **_kwargs) return val def GetXMax(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetXMax,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetXMax(self, *_args, **_kwargs) return val def GetYMax(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetYMax,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetYMax(self, *_args, **_kwargs) return val def GetZMax(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetZMax,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetZMax(self, *_args, **_kwargs) return val def GetNumberButtons(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetNumberButtons,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetNumberButtons(self, *_args, **_kwargs) return val def GetNumberAxes(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetNumberAxes,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetNumberAxes(self, *_args, **_kwargs) return val def GetMaxButtons(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetMaxButtons,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetMaxButtons(self, *_args, **_kwargs) return val def GetMaxAxes(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetMaxAxes,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetMaxAxes(self, *_args, **_kwargs) return val def GetPollingMin(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetPollingMin,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetPollingMin(self, *_args, **_kwargs) return val def GetPollingMax(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetPollingMax,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetPollingMax(self, *_args, **_kwargs) return val def GetRudderMin(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetRudderMin,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetRudderMin(self, *_args, **_kwargs) return val def GetRudderMax(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetRudderMax,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetRudderMax(self, *_args, **_kwargs) return val def GetUMin(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetUMin,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetUMin(self, *_args, **_kwargs) return val def GetUMax(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetUMax,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetUMax(self, *_args, **_kwargs) return val def GetVMin(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetVMin,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetVMin(self, *_args, **_kwargs) return val def GetVMax(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_GetVMax,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_GetVMax(self, *_args, **_kwargs) return val def HasRudder(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_HasRudder,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_HasRudder(self, *_args, **_kwargs) return val def HasZ(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_HasZ,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_HasZ(self, *_args, **_kwargs) return val def HasU(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_HasU,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_HasU(self, *_args, **_kwargs) return val def HasV(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_HasV,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_HasV(self, *_args, **_kwargs) return val def HasPOV(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_HasPOV,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_HasPOV(self, *_args, **_kwargs) return val def HasPOV4Dir(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_HasPOV4Dir,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_HasPOV4Dir(self, *_args, **_kwargs) return val def HasPOVCTS(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_HasPOVCTS,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_HasPOVCTS(self, *_args, **_kwargs) return val def SetCapture(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_SetCapture,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_SetCapture(self, *_args, **_kwargs) return val def ReleaseCapture(self, *_args, **_kwargs): - val = apply(misc2c.wxJoystick_ReleaseCapture,(self,) + _args, _kwargs) + val = misc2c.wxJoystick_ReleaseCapture(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxJoystick instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.IsOk() class wxJoystick(wxJoystickPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxJoystick,_args,_kwargs) + self.this = misc2c.new_wxJoystick(*_args,**_kwargs) self.thisown = 1 @@ -811,16 +827,17 @@ class wxWavePtr(wxObjectPtr): except: pass def IsOk(self, *_args, **_kwargs): - val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs) + val = misc2c.wxWave_IsOk(self, *_args, **_kwargs) return val def Play(self, *_args, **_kwargs): - val = apply(misc2c.wxWave_Play,(self,) + _args, _kwargs) + val = misc2c.wxWave_Play(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWave instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.IsOk() class wxWave(wxWavePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxWave,_args,_kwargs) + self.this = misc2c.new_wxWave(*_args,**_kwargs) self.thisown = 1 @@ -831,57 +848,57 @@ class wxFileTypeInfoPtr : self.this = this self.thisown = 0 def IsValid(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_IsValid,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_IsValid(self, *_args, **_kwargs) return val def SetIcon(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_SetIcon,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_SetIcon(self, *_args, **_kwargs) return val def SetShortDesc(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_SetShortDesc,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_SetShortDesc(self, *_args, **_kwargs) return val def GetMimeType(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetMimeType,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetMimeType(self, *_args, **_kwargs) return val def GetOpenCommand(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetOpenCommand,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetOpenCommand(self, *_args, **_kwargs) return val def GetPrintCommand(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetPrintCommand,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetPrintCommand(self, *_args, **_kwargs) return val def GetShortDesc(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetShortDesc,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetShortDesc(self, *_args, **_kwargs) return val def GetDescription(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetDescription,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetDescription(self, *_args, **_kwargs) return val def GetExtensions(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetExtensions,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetExtensions(self, *_args, **_kwargs) return val def GetExtensionsCount(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetExtensionsCount,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetExtensionsCount(self, *_args, **_kwargs) return val def GetIconFile(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetIconFile,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetIconFile(self, *_args, **_kwargs) return val def GetIconIndex(self, *_args, **_kwargs): - val = apply(misc2c.wxFileTypeInfo_GetIconIndex,(self,) + _args, _kwargs) + val = misc2c.wxFileTypeInfo_GetIconIndex(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileTypeInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileTypeInfo(wxFileTypeInfoPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxFileTypeInfo,_args,_kwargs) + self.this = misc2c.new_wxFileTypeInfo(*_args,**_kwargs) self.thisown = 1 def wxFileTypeInfoSequence(*_args,**_kwargs): - val = wxFileTypeInfoPtr(apply(misc2c.new_wxFileTypeInfoSequence,_args,_kwargs)) + val = wxFileTypeInfoPtr(misc2c.new_wxFileTypeInfoSequence(*_args,**_kwargs)) val.thisown = 1 return val def wxNullFileTypeInfo(*_args,**_kwargs): - val = wxFileTypeInfoPtr(apply(misc2c.new_wxNullFileTypeInfo,_args,_kwargs)) + val = wxFileTypeInfoPtr(misc2c.new_wxNullFileTypeInfo(*_args,**_kwargs)) val.thisown = 1 return val @@ -891,41 +908,41 @@ class wxFileTypePtr : self.this = this self.thisown = 0 def GetMimeType(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetMimeType,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetMimeType(self, *_args, **_kwargs) return val def GetMimeTypes(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetMimeTypes,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetMimeTypes(self, *_args, **_kwargs) return val def GetExtensions(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetExtensions,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetExtensions(self, *_args, **_kwargs) return val def GetIcon(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetIcon,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetIcon(self, *_args, **_kwargs) if val: val = wxIconPtr(val) ; val.thisown = 1 return val def GetIconInfo(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetIconInfo,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetIconInfo(self, *_args, **_kwargs) return val def GetDescription(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetDescription,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetDescription(self, *_args, **_kwargs) return val def GetOpenCommand(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetOpenCommand,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetOpenCommand(self, *_args, **_kwargs) return val def GetPrintCommand(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetPrintCommand,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetPrintCommand(self, *_args, **_kwargs) return val def GetAllCommands(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_GetAllCommands,(self,) + _args, _kwargs) + val = misc2c.wxFileType_GetAllCommands(self, *_args, **_kwargs) return val def SetCommand(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_SetCommand,(self,) + _args, _kwargs) + val = misc2c.wxFileType_SetCommand(self, *_args, **_kwargs) return val def SetDefaultIcon(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_SetDefaultIcon,(self,) + _args, _kwargs) + val = misc2c.wxFileType_SetDefaultIcon(self, *_args, **_kwargs) return val def Unassociate(self, *_args, **_kwargs): - val = apply(misc2c.wxFileType_Unassociate,(self,) + _args, _kwargs) + val = misc2c.wxFileType_Unassociate(self, *_args, **_kwargs) return val def __del__(self, delfunc=misc2c.delete_wxFileType): if self.thisown == 1: @@ -934,10 +951,10 @@ class wxFileTypePtr : except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileType instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileType(wxFileTypePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxFileType,_args,_kwargs) + self.this = misc2c.new_wxFileType(*_args,**_kwargs) self.thisown = 1 @@ -948,37 +965,37 @@ class wxMimeTypesManagerPtr : self.this = this self.thisown = 0 def Initialize(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_Initialize,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_Initialize(self, *_args, **_kwargs) return val def ClearData(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_ClearData,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_ClearData(self, *_args, **_kwargs) return val def GetFileTypeFromExtension(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_GetFileTypeFromExtension,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_GetFileTypeFromExtension(self, *_args, **_kwargs) if val: val = wxFileTypePtr(val) ; val.thisown = 1 return val def GetFileTypeFromMimeType(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_GetFileTypeFromMimeType,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_GetFileTypeFromMimeType(self, *_args, **_kwargs) if val: val = wxFileTypePtr(val) ; val.thisown = 1 return val def ReadMailcap(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_ReadMailcap,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_ReadMailcap(self, *_args, **_kwargs) return val def ReadMimeTypes(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_ReadMimeTypes,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_ReadMimeTypes(self, *_args, **_kwargs) return val def EnumAllFileTypes(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_EnumAllFileTypes,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_EnumAllFileTypes(self, *_args, **_kwargs) return val def AddFallback(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_AddFallback,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_AddFallback(self, *_args, **_kwargs) return val def Associate(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_Associate,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_Associate(self, *_args, **_kwargs) if val: val = wxFileTypePtr(val) ; val.thisown = 1 return val def Unassociate(self, *_args, **_kwargs): - val = apply(misc2c.wxMimeTypesManager_Unassociate,(self,) + _args, _kwargs) + val = misc2c.wxMimeTypesManager_Unassociate(self, *_args, **_kwargs) return val def __del__(self, delfunc=misc2c.delete_wxMimeTypesManager): if self.thisown == 1: @@ -987,10 +1004,10 @@ class wxMimeTypesManagerPtr : except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMimeTypesManager(wxMimeTypesManagerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxMimeTypesManager,_args,_kwargs) + self.this = misc2c.new_wxMimeTypesManager(*_args,**_kwargs) self.thisown = 1 @@ -1001,13 +1018,13 @@ class wxArtProviderPtr(wxObjectPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(misc2c.wxArtProvider__setCallbackInfo,(self,) + _args, _kwargs) + val = misc2c.wxArtProvider__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxArtProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxArtProvider(wxArtProviderPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxArtProvider,_args,_kwargs) + self.this = misc2c.new_wxArtProvider(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxArtProvider) @@ -1025,46 +1042,44 @@ class wxFileHistoryPtr(wxObjectPtr): except: pass def AddFileToHistory(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_AddFileToHistory(self, *_args, **_kwargs) return val def RemoveFileFromHistory(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_RemoveFileFromHistory,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_RemoveFileFromHistory(self, *_args, **_kwargs) return val def GetMaxFiles(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_GetMaxFiles,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_GetMaxFiles(self, *_args, **_kwargs) return val def UseMenu(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_UseMenu,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_UseMenu(self, *_args, **_kwargs) return val def RemoveMenu(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_RemoveMenu,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_RemoveMenu(self, *_args, **_kwargs) return val def Load(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_Load,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_Load(self, *_args, **_kwargs) return val def Save(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_Save,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_Save(self, *_args, **_kwargs) return val def AddFilesToMenu(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_AddFilesToMenu,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_AddFilesToMenu(self, *_args, **_kwargs) return val def AddFilesToThisMenu(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_AddFilesToThisMenu,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_AddFilesToThisMenu(self, *_args, **_kwargs) return val def GetHistoryFile(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_GetHistoryFile,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_GetHistoryFile(self, *_args, **_kwargs) return val def GetCount(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_GetCount,(self,) + _args, _kwargs) - return val - def GetNoHistoryFiles(self, *_args, **_kwargs): - val = apply(misc2c.wxFileHistory_GetNoHistoryFiles,(self,) + _args, _kwargs) + val = misc2c.wxFileHistory_GetCount(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + GetNoHistoryFiles = GetCount class wxFileHistory(wxFileHistoryPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxFileHistory,_args,_kwargs) + self.this = misc2c.new_wxFileHistory(*_args,**_kwargs) self.thisown = 1 @@ -1075,54 +1090,54 @@ class wxEffectsPtr(wxObjectPtr): self.this = this self.thisown = 0 def GetHighlightColour(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_GetHighlightColour,(self,) + _args, _kwargs) + val = misc2c.wxEffects_GetHighlightColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetLightShadow(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_GetLightShadow,(self,) + _args, _kwargs) + val = misc2c.wxEffects_GetLightShadow(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetFaceColour(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_GetFaceColour,(self,) + _args, _kwargs) + val = misc2c.wxEffects_GetFaceColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetMediumShadow(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_GetMediumShadow,(self,) + _args, _kwargs) + val = misc2c.wxEffects_GetMediumShadow(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetDarkShadow(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_GetDarkShadow,(self,) + _args, _kwargs) + val = misc2c.wxEffects_GetDarkShadow(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetHighlightColour(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_SetHighlightColour,(self,) + _args, _kwargs) + val = misc2c.wxEffects_SetHighlightColour(self, *_args, **_kwargs) return val def SetLightShadow(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_SetLightShadow,(self,) + _args, _kwargs) + val = misc2c.wxEffects_SetLightShadow(self, *_args, **_kwargs) return val def SetFaceColour(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_SetFaceColour,(self,) + _args, _kwargs) + val = misc2c.wxEffects_SetFaceColour(self, *_args, **_kwargs) return val def SetMediumShadow(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_SetMediumShadow,(self,) + _args, _kwargs) + val = misc2c.wxEffects_SetMediumShadow(self, *_args, **_kwargs) return val def SetDarkShadow(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_SetDarkShadow,(self,) + _args, _kwargs) + val = misc2c.wxEffects_SetDarkShadow(self, *_args, **_kwargs) return val def Set(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_Set,(self,) + _args, _kwargs) + val = misc2c.wxEffects_Set(self, *_args, **_kwargs) return val def DrawSunkenEdge(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_DrawSunkenEdge,(self,) + _args, _kwargs) + val = misc2c.wxEffects_DrawSunkenEdge(self, *_args, **_kwargs) return val def TileBitmap(self, *_args, **_kwargs): - val = apply(misc2c.wxEffects_TileBitmap,(self,) + _args, _kwargs) + val = misc2c.wxEffects_TileBitmap(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxEffects instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxEffects(wxEffectsPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxEffects,_args,_kwargs) + self.this = misc2c.new_wxEffects(*_args,**_kwargs) self.thisown = 1 @@ -1139,22 +1154,22 @@ class wxSingleInstanceCheckerPtr : except: pass def Create(self, *_args, **_kwargs): - val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs) + val = misc2c.wxSingleInstanceChecker_Create(self, *_args, **_kwargs) return val def IsAnotherRunning(self, *_args, **_kwargs): - val = apply(misc2c.wxSingleInstanceChecker_IsAnotherRunning,(self,) + _args, _kwargs) + val = misc2c.wxSingleInstanceChecker_IsAnotherRunning(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSingleInstanceChecker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSingleInstanceChecker(wxSingleInstanceCheckerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(misc2c.new_wxSingleInstanceChecker,_args,_kwargs) + self.this = misc2c.new_wxSingleInstanceChecker(*_args,**_kwargs) self.thisown = 1 def wxPreSingleInstanceChecker(*_args,**_kwargs): - val = wxSingleInstanceCheckerPtr(apply(misc2c.new_wxPreSingleInstanceChecker,_args,_kwargs)) + val = wxSingleInstanceCheckerPtr(misc2c.new_wxPreSingleInstanceChecker(*_args,**_kwargs)) val.thisown = 1 return val @@ -1192,21 +1207,21 @@ wxGetDisplayDepth = misc2c.wxGetDisplayDepth wxDisplaySize = misc2c.wxDisplaySize def wxGetDisplaySize(*_args, **_kwargs): - val = apply(misc2c.wxGetDisplaySize,_args,_kwargs) + val = misc2c.wxGetDisplaySize(*_args,**_kwargs) if val: val = wxSizePtr(val); val.thisown = 1 return val wxDisplaySizeMM = misc2c.wxDisplaySizeMM def wxGetDisplaySizeMM(*_args, **_kwargs): - val = apply(misc2c.wxGetDisplaySizeMM,_args,_kwargs) + val = misc2c.wxGetDisplaySizeMM(*_args,**_kwargs) if val: val = wxSizePtr(val); val.thisown = 1 return val wxClientDisplayRect = misc2c.wxClientDisplayRect def wxGetClientDisplayRect(*_args, **_kwargs): - val = apply(misc2c.wxGetClientDisplayRect,_args,_kwargs) + val = misc2c.wxGetClientDisplayRect(*_args,**_kwargs) if val: val = wxRectPtr(val); val.thisown = 1 return val @@ -1215,15 +1230,15 @@ wxSetCursor = misc2c.wxSetCursor wxBeginBusyCursor = misc2c.wxBeginBusyCursor def wxGetActiveWindow(*_args, **_kwargs): - val = apply(misc2c.wxGetActiveWindow,_args,_kwargs) + val = misc2c.wxGetActiveWindow(*_args,**_kwargs) return val def wxGenericFindWindowAtPoint(*_args, **_kwargs): - val = apply(misc2c.wxGenericFindWindowAtPoint,_args,_kwargs) + val = misc2c.wxGenericFindWindowAtPoint(*_args,**_kwargs) return val def wxFindWindowAtPoint(*_args, **_kwargs): - val = apply(misc2c.wxFindWindowAtPoint,_args,_kwargs) + val = misc2c.wxFindWindowAtPoint(*_args,**_kwargs) return val wxCheckForInterrupt = misc2c.wxCheckForInterrupt @@ -1231,7 +1246,7 @@ wxCheckForInterrupt = misc2c.wxCheckForInterrupt wxFlushEvents = misc2c.wxFlushEvents def wxGetTopLevelParent(*_args, **_kwargs): - val = apply(misc2c.wxGetTopLevelParent,_args,_kwargs) + val = misc2c.wxGetTopLevelParent(*_args,**_kwargs) return val wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime @@ -1255,7 +1270,7 @@ wxThread_IsMain = misc2c.wxThread_IsMain wxShowTip = misc2c.wxShowTip def wxCreateFileTipProvider(*_args, **_kwargs): - val = apply(misc2c.wxCreateFileTipProvider,_args,_kwargs) + val = misc2c.wxCreateFileTipProvider(*_args,**_kwargs) if val: val = wxTipProviderPtr(val); val.thisown = 1 return val @@ -1294,17 +1309,17 @@ wxSafeShowMessage = misc2c.wxSafeShowMessage wxExecute = misc2c.wxExecute def wxWaveData(*_args, **_kwargs): - val = apply(misc2c.wxWaveData,_args,_kwargs) + val = misc2c.wxWaveData(*_args,**_kwargs) if val: val = wxWavePtr(val); val.thisown = 1 return val def wxSystemSettings_GetColour(*_args, **_kwargs): - val = apply(misc2c.wxSystemSettings_GetColour,_args,_kwargs) + val = misc2c.wxSystemSettings_GetColour(*_args,**_kwargs) if val: val = wxColourPtr(val); val.thisown = 1 return val def wxSystemSettings_GetFont(*_args, **_kwargs): - val = apply(misc2c.wxSystemSettings_GetFont,_args,_kwargs) + val = misc2c.wxSystemSettings_GetFont(*_args,**_kwargs) if val: val = wxFontPtr(val); val.thisown = 1 return val @@ -1316,6 +1331,16 @@ wxSystemSettings_GetScreenType = misc2c.wxSystemSettings_GetScreenType wxSystemSettings_SetScreenType = misc2c.wxSystemSettings_SetScreenType +wxSystemOptions_SetOption = misc2c.wxSystemOptions_SetOption + +wxSystemOptions_SetOptionInt = misc2c.wxSystemOptions_SetOptionInt + +wxSystemOptions_GetOption = misc2c.wxSystemOptions_GetOption + +wxSystemOptions_GetOptionInt = misc2c.wxSystemOptions_GetOptionInt + +wxSystemOptions_HasOption = misc2c.wxSystemOptions_HasOption + wxToolTip_Enable = misc2c.wxToolTip_Enable wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay @@ -1329,12 +1354,12 @@ wxLog_OnLog = misc2c.wxLog_OnLog wxLog_FlushActive = misc2c.wxLog_FlushActive def wxLog_GetActiveTarget(*_args, **_kwargs): - val = apply(misc2c.wxLog_GetActiveTarget,_args,_kwargs) + val = misc2c.wxLog_GetActiveTarget(*_args,**_kwargs) if val: val = wxLogPtr(val) return val def wxLog_SetActiveTarget(*_args, **_kwargs): - val = apply(misc2c.wxLog_SetActiveTarget,_args,_kwargs) + val = misc2c.wxLog_SetActiveTarget(*_args,**_kwargs) if val: val = wxLogPtr(val) return val @@ -1373,7 +1398,7 @@ wxProcess_Kill = misc2c.wxProcess_Kill wxProcess_Exists = misc2c.wxProcess_Exists def wxProcess_Open(*_args, **_kwargs): - val = apply(misc2c.wxProcess_Open,_args,_kwargs) + val = misc2c.wxProcess_Open(*_args,**_kwargs) if val: val = wxProcessPtr(val) return val @@ -1388,12 +1413,12 @@ wxArtProvider_PopProvider = misc2c.wxArtProvider_PopProvider wxArtProvider_RemoveProvider = misc2c.wxArtProvider_RemoveProvider def wxArtProvider_GetBitmap(*_args, **_kwargs): - val = apply(misc2c.wxArtProvider_GetBitmap,_args,_kwargs) + val = misc2c.wxArtProvider_GetBitmap(*_args,**_kwargs) if val: val = wxBitmapPtr(val); val.thisown = 1 return val def wxArtProvider_GetIcon(*_args, **_kwargs): - val = apply(misc2c.wxArtProvider_GetIcon,_args,_kwargs) + val = misc2c.wxArtProvider_GetIcon(*_args,**_kwargs) if val: val = wxIconPtr(val); val.thisown = 1 return val diff --git a/wxPython/src/msw/printfw.cpp b/wxPython/src/msw/printfw.cpp index 44a5114bbd..78ccb7455b 100644 --- a/wxPython/src/msw/printfw.cpp +++ b/wxPython/src/msw/printfw.cpp @@ -64,8 +64,13 @@ extern PyObject *SWIG_newvarlink(void); // Put some wx default wxChar* values into wxStrings. static const wxChar* wxPrintoutTitleStr = wxT("Printout"); DECLARE_DEF_STRING(PrintoutTitleStr); + static const wxChar* wxPreviewCanvasNameStr = wxT("previewcanvas"); + DECLARE_DEF_STRING(PreviewCanvasNameStr); DECLARE_DEF_STRING(FrameNameStr); + DECLARE_DEF_STRING(PanelNameStr); + DECLARE_DEF_STRING(DialogNameStr); + static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -151,6 +156,129 @@ IMP_PYCALLBACK_BOOL_INT_pure(wxPyPrintout, wxPrintout, OnPrintPage); IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage); + + +#define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME) \ + bool CBNAME(wxPreviewCanvas* a, wxDC& b); \ + bool base_##CBNAME(wxPreviewCanvas* a, wxDC& b) + + +#define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) { \ + bool rval=FALSE; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* win = wxPyMake_wxObject(a); \ + PyObject* dc = wxPyMake_wxObject(&b); \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc));\ + Py_DECREF(win); \ + Py_DECREF(dc); \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + rval = PCLASS::CBNAME(a, b); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) { \ + return PCLASS::CBNAME(a, b); \ + } + + + + +class wxPyPrintPreview : public wxPrintPreview +{ + DECLARE_CLASS(wxPyPrintPreview) +public: + wxPyPrintPreview(wxPyPrintout* printout, + wxPyPrintout* printoutForPrinting, + wxPrintData* data=NULL) + : wxPrintPreview(printout, printoutForPrinting, data) + {} + + DEC_PYCALLBACK_BOOL_INT(SetCurrentPage); + DEC_PYCALLBACK_BOOL_PREWINDC(PaintPage); + DEC_PYCALLBACK_BOOL_PREWINDC(DrawBlankPage); + DEC_PYCALLBACK_BOOL_INT(RenderPage); + DEC_PYCALLBACK_VOID_INT(SetZoom); + DEC_PYCALLBACK_BOOL_BOOL(Print); + DEC_PYCALLBACK_VOID_(DetermineScaling); + + PYPRIVATE; +}; + +// Stupid renamed classes... Fix this in 2.5... +#if defined(__WXMSW__) +IMPLEMENT_CLASS( wxPyPrintPreview, wxWindowsPrintPreview ); +#elif defined(__WXMAC__) +IMPLEMENT_CLASS( wxPyPrintPreview, wxMacPrintPreview ); +#else +IMPLEMENT_CLASS( wxPyPrintPreview, wxPostScriptPrintPreview ); +#endif + +IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, SetCurrentPage); +IMP_PYCALLBACK_BOOL_PREWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage); +IMP_PYCALLBACK_BOOL_PREWINDC(wxPyPrintPreview, wxPrintPreview, DrawBlankPage); +IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, RenderPage); +IMP_PYCALLBACK_VOID_INT (wxPyPrintPreview, wxPrintPreview, SetZoom); +IMP_PYCALLBACK_BOOL_BOOL (wxPyPrintPreview, wxPrintPreview, Print); +IMP_PYCALLBACK_VOID_ (wxPyPrintPreview, wxPrintPreview, DetermineScaling); + +class wxPyPreviewFrame : public wxPreviewFrame +{ + DECLARE_CLASS(wxPyPreviewFrame); +public: + wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxPyFrameNameStr) + : wxPreviewFrame(preview, parent, title, pos, size, style, name) + {} + + void SetPreviewCanvas(wxPreviewCanvas* canvas) { m_previewCanvas = canvas; } + void SetControlBar(wxPreviewControlBar* bar) { m_controlBar = bar; } + + DEC_PYCALLBACK_VOID_(Initialize); + DEC_PYCALLBACK_VOID_(CreateCanvas); + DEC_PYCALLBACK_VOID_(CreateControlBar); + + PYPRIVATE; +}; + +IMPLEMENT_CLASS(wxPyPreviewFrame, wxPreviewFrame); + +IMP_PYCALLBACK_VOID_(wxPyPreviewFrame, wxPreviewFrame, Initialize); +IMP_PYCALLBACK_VOID_(wxPyPreviewFrame, wxPreviewFrame, CreateCanvas); +IMP_PYCALLBACK_VOID_(wxPyPreviewFrame, wxPreviewFrame, CreateControlBar); + +class wxPyPreviewControlBar : public wxPreviewControlBar +{ + DECLARE_CLASS(wxPyPreviewControlBar); +public: + wxPyPreviewControlBar(wxPrintPreview *preview, + long buttons, + wxWindow *parent, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPyPanelNameStr) + : wxPreviewControlBar(preview, buttons, parent, pos, size, style, name) + {} + + void SetPrintPreview(wxPrintPreview* preview) { m_printPreview = preview; } + + DEC_PYCALLBACK_VOID_(CreateButtons); + DEC_PYCALLBACK_VOID_INT(SetZoomControl); + + PYPRIVATE; +}; + +IMPLEMENT_CLASS(wxPyPreviewControlBar, wxPreviewControlBar); +IMP_PYCALLBACK_VOID_(wxPyPreviewControlBar, wxPreviewControlBar, CreateButtons); +IMP_PYCALLBACK_VOID_INT(wxPyPreviewControlBar, wxPreviewControlBar, SetZoomControl); #ifdef __cplusplus extern "C" { #endif @@ -1083,11 +1211,10 @@ static PyObject *_wrap_wxPrintData_GetPrinterTranslateY(PyObject *self, PyObject #define wxPrintData_GetPrintMode(_swigobj) (_swigobj->GetPrintMode()) static PyObject *_wrap_wxPrintData_GetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintMode * _result; + wxPrintMode _result; wxPrintData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrintMode",_kwnames,&_argo0)) @@ -1101,12 +1228,11 @@ static PyObject *_wrap_wxPrintData_GetPrintMode(PyObject *self, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxPrintMode (wxPrintData_GetPrintMode(_arg0)); + _result = (wxPrintMode )wxPrintData_GetPrintMode(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPrintMode_p"); - _resultobj = Py_BuildValue("s",_ptemp); +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1485,13 +1611,12 @@ static PyObject *_wrap_wxPrintData_SetPrinterTranslation(PyObject *self, PyObjec static PyObject *_wrap_wxPrintData_SetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintData * _arg0; - wxPrintMode * _arg1; + wxPrintMode _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; char *_kwnames[] = { "self","printMode", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPrintMode",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetPrintMode",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1500,16 +1625,9 @@ static PyObject *_wrap_wxPrintData_SetPrintMode(PyObject *self, PyObject *args, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintMode_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintData_SetPrintMode. Expected _wxPrintMode_p."); - return NULL; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintData_SetPrintMode(_arg0,*_arg1); + wxPrintData_SetPrintMode(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2963,151 +3081,139 @@ static PyObject *_wrap_delete_wxPrintDialogData(PyObject *self, PyObject *args, return _resultobj; } -#define wxPrintDialogData_EnableHelp(_swigobj,_swigarg0) (_swigobj->EnableHelp(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_EnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetFromPage(_swigobj) (_swigobj->GetFromPage()) +static PyObject *_wrap_wxPrintDialogData_GetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + int _result; wxPrintDialogData * _arg0; - bool _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","flag", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnableHelp",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetFromPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableHelp. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetFromPage. Expected _wxPrintDialogData_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_EnableHelp(_arg0,_arg1); + _result = (int )wxPrintDialogData_GetFromPage(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintDialogData_EnablePageNumbers(_swigobj,_swigarg0) (_swigobj->EnablePageNumbers(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_EnablePageNumbers(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetToPage(_swigobj) (_swigobj->GetToPage()) +static PyObject *_wrap_wxPrintDialogData_GetToPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + int _result; wxPrintDialogData * _arg0; - bool _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","flag", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnablePageNumbers",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetToPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePageNumbers. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetToPage. Expected _wxPrintDialogData_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_EnablePageNumbers(_arg0,_arg1); + _result = (int )wxPrintDialogData_GetToPage(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintDialogData_EnablePrintToFile(_swigobj,_swigarg0) (_swigobj->EnablePrintToFile(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_EnablePrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetMinPage(_swigobj) (_swigobj->GetMinPage()) +static PyObject *_wrap_wxPrintDialogData_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + int _result; wxPrintDialogData * _arg0; - bool _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","flag", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnablePrintToFile",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetMinPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePrintToFile. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMinPage. Expected _wxPrintDialogData_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_EnablePrintToFile(_arg0,_arg1); + _result = (int )wxPrintDialogData_GetMinPage(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintDialogData_EnableSelection(_swigobj,_swigarg0) (_swigobj->EnableSelection(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_EnableSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetMaxPage(_swigobj) (_swigobj->GetMaxPage()) +static PyObject *_wrap_wxPrintDialogData_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + int _result; wxPrintDialogData * _arg0; - bool _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","flag", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnableSelection",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetMaxPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableSelection. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMaxPage. Expected _wxPrintDialogData_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_EnableSelection(_arg0,_arg1); + _result = (int )wxPrintDialogData_GetMaxPage(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintDialogData_GetAllPages(_swigobj) (_swigobj->GetAllPages()) -static PyObject *_wrap_wxPrintDialogData_GetAllPages(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetNoCopies(_swigobj) (_swigobj->GetNoCopies()) +static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; + int _result; wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetAllPages",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetNoCopies",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetAllPages. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetNoCopies. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintDialogData_GetAllPages(_arg0); + _result = (int )wxPrintDialogData_GetNoCopies(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3115,8 +3221,8 @@ static PyObject *_wrap_wxPrintDialogData_GetAllPages(PyObject *self, PyObject *a return _resultobj; } -#define wxPrintDialogData_GetCollate(_swigobj) (_swigobj->GetCollate()) -static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetAllPages(_swigobj) (_swigobj->GetAllPages()) +static PyObject *_wrap_wxPrintDialogData_GetAllPages(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxPrintDialogData * _arg0; @@ -3124,18 +3230,18 @@ static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *ar char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetCollate",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetAllPages",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetCollate. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetAllPages. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintDialogData_GetCollate(_arg0); + _result = (bool )wxPrintDialogData_GetAllPages(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3143,27 +3249,27 @@ static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *ar return _resultobj; } -#define wxPrintDialogData_GetFromPage(_swigobj) (_swigobj->GetFromPage()) -static PyObject *_wrap_wxPrintDialogData_GetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetSelection(_swigobj) (_swigobj->GetSelection()) +static PyObject *_wrap_wxPrintDialogData_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; + bool _result; wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetFromPage",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetSelection",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetFromPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetSelection. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintDialogData_GetFromPage(_arg0); + _result = (bool )wxPrintDialogData_GetSelection(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3171,27 +3277,27 @@ static PyObject *_wrap_wxPrintDialogData_GetFromPage(PyObject *self, PyObject *a return _resultobj; } -#define wxPrintDialogData_GetMaxPage(_swigobj) (_swigobj->GetMaxPage()) -static PyObject *_wrap_wxPrintDialogData_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetCollate(_swigobj) (_swigobj->GetCollate()) +static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; + bool _result; wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetMaxPage",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetCollate",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMaxPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetCollate. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintDialogData_GetMaxPage(_arg0); + _result = (bool )wxPrintDialogData_GetCollate(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3199,27 +3305,27 @@ static PyObject *_wrap_wxPrintDialogData_GetMaxPage(PyObject *self, PyObject *ar return _resultobj; } -#define wxPrintDialogData_GetMinPage(_swigobj) (_swigobj->GetMinPage()) -static PyObject *_wrap_wxPrintDialogData_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetPrintToFile(_swigobj) (_swigobj->GetPrintToFile()) +static PyObject *_wrap_wxPrintDialogData_GetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; + bool _result; wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetMinPage",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetPrintToFile",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetMinPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintToFile. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintDialogData_GetMinPage(_arg0); + _result = (bool )wxPrintDialogData_GetPrintToFile(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3227,27 +3333,27 @@ static PyObject *_wrap_wxPrintDialogData_GetMinPage(PyObject *self, PyObject *ar return _resultobj; } -#define wxPrintDialogData_GetNoCopies(_swigobj) (_swigobj->GetNoCopies()) -static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetSetupDialog(_swigobj) (_swigobj->GetSetupDialog()) +static PyObject *_wrap_wxPrintDialogData_GetSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; + bool _result; wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetNoCopies",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetSetupDialog",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetNoCopies. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetSetupDialog. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintDialogData_GetNoCopies(_arg0); + _result = (bool )wxPrintDialogData_GetSetupDialog(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3255,150 +3361,143 @@ static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *a return _resultobj; } -static wxPrintData * wxPrintDialogData_GetPrintData(wxPrintDialogData *self) { - return new wxPrintData(self->GetPrintData()); // force a copy - } -static PyObject *_wrap_wxPrintDialogData_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetFromPage(_swigobj,_swigarg0) (_swigobj->SetFromPage(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintData * _result; wxPrintDialogData * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","v", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetPrintData",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetFromPage",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintData. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetFromPage. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPrintData *)wxPrintDialogData_GetPrintData(_arg0); + wxPrintDialogData_SetFromPage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintDialogData_GetPrintToFile(_swigobj) (_swigobj->GetPrintToFile()) -static PyObject *_wrap_wxPrintDialogData_GetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetToPage(_swigobj,_swigarg0) (_swigobj->SetToPage(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetToPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; wxPrintDialogData * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","v", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetPrintToFile",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetToPage",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintToFile. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetToPage. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintDialogData_GetPrintToFile(_arg0); + wxPrintDialogData_SetToPage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintDialogData_GetToPage(_swigobj) (_swigobj->GetToPage()) -static PyObject *_wrap_wxPrintDialogData_GetToPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetMinPage(_swigobj,_swigarg0) (_swigobj->SetMinPage(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; wxPrintDialogData * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","v", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetToPage",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetMinPage",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetToPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMinPage. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintDialogData_GetToPage(_arg0); + wxPrintDialogData_SetMinPage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintDialogData_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxPrintDialogData_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetMaxPage(_swigobj,_swigarg0) (_swigobj->SetMaxPage(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; wxPrintDialogData * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","v", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_Ok",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetMaxPage",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_Ok. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMaxPage. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintDialogData_Ok(_arg0); + wxPrintDialogData_SetMaxPage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintDialogData_SetCollate(_swigobj,_swigarg0) (_swigobj->SetCollate(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetNoCopies(_swigobj,_swigarg0) (_swigobj->SetNoCopies(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; - bool _arg1; + int _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","flag", NULL }; + char *_kwnames[] = { "self","v", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetCollate",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetNoCopies",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetCollate. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetNoCopies. Expected _wxPrintDialogData_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetCollate(_arg0,_arg1); + wxPrintDialogData_SetNoCopies(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3407,27 +3506,29 @@ static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *ar return _resultobj; } -#define wxPrintDialogData_SetFromPage(_swigobj,_swigarg0) (_swigobj->SetFromPage(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetAllPages(_swigobj,_swigarg0) (_swigobj->SetAllPages(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetAllPages(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; - int _arg1; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetFromPage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetAllPages",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetFromPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetAllPages. Expected _wxPrintDialogData_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetFromPage(_arg0,_arg1); + wxPrintDialogData_SetAllPages(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3436,27 +3537,29 @@ static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *a return _resultobj; } -#define wxPrintDialogData_SetMaxPage(_swigobj,_swigarg0) (_swigobj->SetMaxPage(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; - int _arg1; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetMaxPage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetSelection",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMaxPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetSelection. Expected _wxPrintDialogData_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetMaxPage(_arg0,_arg1); + wxPrintDialogData_SetSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3465,27 +3568,29 @@ static PyObject *_wrap_wxPrintDialogData_SetMaxPage(PyObject *self, PyObject *ar return _resultobj; } -#define wxPrintDialogData_SetMinPage(_swigobj,_swigarg0) (_swigobj->SetMinPage(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetCollate(_swigobj,_swigarg0) (_swigobj->SetCollate(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; - int _arg1; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetMinPage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetCollate",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetMinPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetCollate. Expected _wxPrintDialogData_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetMinPage(_arg0,_arg1); + wxPrintDialogData_SetCollate(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3494,27 +3599,29 @@ static PyObject *_wrap_wxPrintDialogData_SetMinPage(PyObject *self, PyObject *ar return _resultobj; } -#define wxPrintDialogData_SetNoCopies(_swigobj,_swigarg0) (_swigobj->SetNoCopies(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetPrintToFile(_swigobj,_swigarg0) (_swigobj->SetPrintToFile(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; - int _arg1; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","n", NULL }; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetNoCopies",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetPrintToFile",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetNoCopies. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintToFile. Expected _wxPrintDialogData_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetNoCopies(_arg0,_arg1); + wxPrintDialogData_SetPrintToFile(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3523,34 +3630,29 @@ static PyObject *_wrap_wxPrintDialogData_SetNoCopies(PyObject *self, PyObject *a return _resultobj; } -#define wxPrintDialogData_SetPrintData(_swigobj,_swigarg0) (_swigobj->SetPrintData(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_SetSetupDialog(_swigobj,_swigarg0) (_swigobj->SetSetupDialog(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; - wxPrintData * _arg1; + bool _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","printData", NULL }; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintDialogData_SetPrintData",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetSetupDialog",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintData. Expected _wxPrintDialogData_p."); - return NULL; - } - } - if (_argo1) { - if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintDialogData_SetPrintData. Expected _wxPrintData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetSetupDialog. Expected _wxPrintDialogData_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetPrintData(_arg0,*_arg1); + wxPrintDialogData_SetSetupDialog(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3559,8 +3661,8 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintData(PyObject *self, PyObject * return _resultobj; } -#define wxPrintDialogData_SetPrintToFile(_swigobj,_swigarg0) (_swigobj->SetPrintToFile(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_EnablePrintToFile(_swigobj,_swigarg0) (_swigobj->EnablePrintToFile(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_EnablePrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; bool _arg1; @@ -3569,19 +3671,19 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetPrintToFile",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnablePrintToFile",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintToFile. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePrintToFile. Expected _wxPrintDialogData_p."); return NULL; } } _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetPrintToFile(_arg0,_arg1); + wxPrintDialogData_EnablePrintToFile(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3590,8 +3692,8 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject return _resultobj; } -#define wxPrintDialogData_SetSetupDialog(_swigobj,_swigarg0) (_swigobj->SetSetupDialog(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_EnableSelection(_swigobj,_swigarg0) (_swigobj->EnableSelection(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_EnableSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; bool _arg1; @@ -3600,19 +3702,19 @@ static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetSetupDialog",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnableSelection",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetSetupDialog. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableSelection. Expected _wxPrintDialogData_p."); return NULL; } } _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetSetupDialog(_arg0,_arg1); + wxPrintDialogData_EnableSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3621,27 +3723,29 @@ static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject return _resultobj; } -#define wxPrintDialogData_SetToPage(_swigobj,_swigarg0) (_swigobj->SetToPage(_swigarg0)) -static PyObject *_wrap_wxPrintDialogData_SetToPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_EnablePageNumbers(_swigobj,_swigarg0) (_swigobj->EnablePageNumbers(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_EnablePageNumbers(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrintDialogData * _arg0; - int _arg1; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetToPage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnablePageNumbers",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetToPage. Expected _wxPrintDialogData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnablePageNumbers. Expected _wxPrintDialogData_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData_SetToPage(_arg0,_arg1); + wxPrintDialogData_EnablePageNumbers(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3650,175 +3754,114 @@ static PyObject *_wrap_wxPrintDialogData_SetToPage(PyObject *self, PyObject *arg return _resultobj; } -static void *SwigwxPrintDialogTowxDialog(void *ptr) { - wxPrintDialog *src; - wxDialog *dest; - src = (wxPrintDialog *) ptr; - dest = (wxDialog *) src; - return (void *) dest; -} - -static void *SwigwxPrintDialogTowxTopLevelWindow(void *ptr) { - wxPrintDialog *src; - wxTopLevelWindow *dest; - src = (wxPrintDialog *) ptr; - dest = (wxTopLevelWindow *) src; - return (void *) dest; -} - -static void *SwigwxPrintDialogTowxWindow(void *ptr) { - wxPrintDialog *src; - wxWindow *dest; - src = (wxPrintDialog *) ptr; - dest = (wxWindow *) src; - return (void *) dest; -} - -static void *SwigwxPrintDialogTowxEvtHandler(void *ptr) { - wxPrintDialog *src; - wxEvtHandler *dest; - src = (wxPrintDialog *) ptr; - dest = (wxEvtHandler *) src; - return (void *) dest; -} - -static void *SwigwxPrintDialogTowxObject(void *ptr) { - wxPrintDialog *src; - wxObject *dest; - src = (wxPrintDialog *) ptr; - dest = (wxObject *) src; - return (void *) dest; -} - -#define new_wxPrintDialog(_swigarg0,_swigarg1) (new wxPrintDialog(_swigarg0,_swigarg1)) -static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_EnableHelp(_swigobj,_swigarg0) (_swigobj->EnableHelp(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_EnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintDialog * _result; - wxWindow * _arg0; - wxPrintDialogData * _arg1 = (wxPrintDialogData *) NULL; + wxPrintDialogData * _arg0; + bool _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "parent","data", NULL }; - char _ptemp[128]; + int tempbool1; + char *_kwnames[] = { "self","flag", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxPrintDialog",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnableHelp",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintDialog. Expected _wxWindow_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintDialog. Expected _wxPrintDialogData_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_EnableHelp. Expected _wxPrintDialogData_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPrintDialog *)new_wxPrintDialog(_arg0,_arg1); + wxPrintDialogData_EnableHelp(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialog_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintDialog_GetPrintDialogData(_swigobj) (_swigobj->GetPrintDialogData()) -static PyObject *_wrap_wxPrintDialog_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetEnablePrintToFile(_swigobj) (_swigobj->GetEnablePrintToFile()) +static PyObject *_wrap_wxPrintDialogData_GetEnablePrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintDialogData * _result; - wxPrintDialog * _arg0; + bool _result; + wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_GetPrintDialogData",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetEnablePrintToFile",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDialogData. Expected _wxPrintDialog_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetEnablePrintToFile. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData & _result_ref = wxPrintDialog_GetPrintDialogData(_arg0); - _result = (wxPrintDialogData *) &_result_ref; + _result = (bool )wxPrintDialogData_GetEnablePrintToFile(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintDialog_GetPrintDC(_swigobj) (_swigobj->GetPrintDC()) -static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetEnableSelection(_swigobj) (_swigobj->GetEnableSelection()) +static PyObject *_wrap_wxPrintDialogData_GetEnableSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxDC * _result; - wxPrintDialog * _arg0; + bool _result; + wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_GetPrintDC",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetEnableSelection",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDC. Expected _wxPrintDialog_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetEnableSelection. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxDC *)wxPrintDialog_GetPrintDC(_arg0); + _result = (bool )wxPrintDialogData_GetEnableSelection(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintDialog_ShowModal(_swigobj) (_swigobj->ShowModal()) -static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetEnablePageNumbers(_swigobj) (_swigobj->GetEnablePageNumbers()) +static PyObject *_wrap_wxPrintDialogData_GetEnablePageNumbers(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxPrintDialog * _arg0; + bool _result; + wxPrintDialogData * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_ShowModal",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetEnablePageNumbers",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_ShowModal. Expected _wxPrintDialog_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetEnablePageNumbers. Expected _wxPrintDialogData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintDialog_ShowModal(_arg0); + _result = (bool )wxPrintDialogData_GetEnablePageNumbers(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3826,16 +3869,321 @@ static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args, P return _resultobj; } -static void *SwigwxPyPrintoutTowxObject(void *ptr) { - wxPyPrintout *src; - wxObject *dest; - src = (wxPyPrintout *) ptr; - dest = (wxObject *) src; - return (void *) dest; -} - -#define new_wxPrintout(_swigarg0) (new wxPyPrintout(_swigarg0)) -static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintDialogData_GetEnableHelp(_swigobj) (_swigobj->GetEnableHelp()) +static PyObject *_wrap_wxPrintDialogData_GetEnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrintDialogData * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetEnableHelp",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetEnableHelp. Expected _wxPrintDialogData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintDialogData_GetEnableHelp(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrintDialogData_Ok(_swigobj) (_swigobj->Ok()) +static PyObject *_wrap_wxPrintDialogData_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrintDialogData * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_Ok",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_Ok. Expected _wxPrintDialogData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintDialogData_Ok(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static wxPrintData * wxPrintDialogData_GetPrintData(wxPrintDialogData *self) { + return new wxPrintData(self->GetPrintData()); // force a copy + } +static PyObject *_wrap_wxPrintDialogData_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintData * _result; + wxPrintDialogData * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetPrintData",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_GetPrintData. Expected _wxPrintDialogData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPrintData *)wxPrintDialogData_GetPrintData(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintData_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPrintDialogData_SetPrintData(_swigobj,_swigarg0) (_swigobj->SetPrintData(_swigarg0)) +static PyObject *_wrap_wxPrintDialogData_SetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintDialogData * _arg0; + wxPrintData * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","printData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintDialogData_SetPrintData",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialogData_SetPrintData. Expected _wxPrintDialogData_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintDialogData_SetPrintData. Expected _wxPrintData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintDialogData_SetPrintData(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void *SwigwxPrintDialogTowxDialog(void *ptr) { + wxPrintDialog *src; + wxDialog *dest; + src = (wxPrintDialog *) ptr; + dest = (wxDialog *) src; + return (void *) dest; +} + +static void *SwigwxPrintDialogTowxTopLevelWindow(void *ptr) { + wxPrintDialog *src; + wxTopLevelWindow *dest; + src = (wxPrintDialog *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + +static void *SwigwxPrintDialogTowxWindow(void *ptr) { + wxPrintDialog *src; + wxWindow *dest; + src = (wxPrintDialog *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxPrintDialogTowxEvtHandler(void *ptr) { + wxPrintDialog *src; + wxEvtHandler *dest; + src = (wxPrintDialog *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static void *SwigwxPrintDialogTowxObject(void *ptr) { + wxPrintDialog *src; + wxObject *dest; + src = (wxPrintDialog *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxPrintDialog(_swigarg0,_swigarg1) (new wxPrintDialog(_swigarg0,_swigarg1)) +static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintDialog * _result; + wxWindow * _arg0; + wxPrintDialogData * _arg1 = (wxPrintDialogData *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "parent","data", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxPrintDialog",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintDialog. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintDialog. Expected _wxPrintDialogData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPrintDialog *)new_wxPrintDialog(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialog_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPrintDialog_GetPrintDialogData(_swigobj) (_swigobj->GetPrintDialogData()) +static PyObject *_wrap_wxPrintDialog_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintDialogData * _result; + wxPrintDialog * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_GetPrintDialogData",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDialogData. Expected _wxPrintDialog_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintDialogData & _result_ref = wxPrintDialog_GetPrintDialogData(_arg0); + _result = (wxPrintDialogData *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPrintDialog_GetPrintDC(_swigobj) (_swigobj->GetPrintDC()) +static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _result; + wxPrintDialog * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_GetPrintDC",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_GetPrintDC. Expected _wxPrintDialog_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxDC *)wxPrintDialog_GetPrintDC(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + +#define wxPrintDialog_ShowModal(_swigobj) (_swigobj->ShowModal()) +static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxPrintDialog * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_ShowModal",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintDialog_ShowModal. Expected _wxPrintDialog_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxPrintDialog_ShowModal(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static void *SwigwxPyPrintoutTowxObject(void *ptr) { + wxPyPrintout *src; + wxObject *dest; + src = (wxPyPrintout *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxPrintout(_swigarg0) (new wxPyPrintout(_swigarg0)) +static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyPrintout * _result; wxString * _arg0 = (wxString *) &wxPyPrintoutTitleStr; @@ -3844,64 +4192,1642 @@ static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args, PyObject * char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxPrintout",_kwnames,&_obj0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxPrintout",_kwnames,&_obj0)) + return NULL; + if (_obj0) +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPyPrintout *)new_wxPrintout(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +#define wxPrintout__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintout__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + PyObject * _arg1; + PyObject * _arg2; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","self","_class", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrintout__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout__setCallbackInfo. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout__setCallbackInfo(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxPyPrintout_Destroy(wxPyPrintout *self) { delete self; } +static PyObject *_wrap_wxPrintout_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_Destroy",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_Destroy. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPyPrintout_Destroy(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintout_GetDC(_swigobj) (_swigobj->GetDC()) +static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _result; + wxPyPrintout * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetDC",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetDC. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxDC *)wxPrintout_GetDC(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + +#define wxPrintout_GetPageSizeMM(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPageSizeMM(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + int * _arg1; + int temp; + int * _arg2; + int temp0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPageSizeMM",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizeMM. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_GetPageSizeMM(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxPrintout_GetPageSizePixels(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPageSizePixels(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + int * _arg1; + int temp; + int * _arg2; + int temp0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPageSizePixels",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizePixels. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_GetPageSizePixels(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxPrintout_GetPPIPrinter(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPPIPrinter(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + int * _arg1; + int temp; + int * _arg2; + int temp0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPPIPrinter",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIPrinter. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_GetPPIPrinter(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxPrintout_GetPPIScreen(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPPIScreen(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + int * _arg1; + int temp; + int * _arg2; + int temp0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPPIScreen",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIScreen. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_GetPPIScreen(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxPrintout_IsPreview(_swigobj) (_swigobj->IsPreview()) +static PyObject *_wrap_wxPrintout_IsPreview(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPyPrintout * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_IsPreview",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_IsPreview. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintout_IsPreview(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrintout_base_OnBeginDocument(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnBeginDocument(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintout_base_OnBeginDocument(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPyPrintout * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","startPage","endPage", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxPrintout_base_OnBeginDocument",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginDocument. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintout_base_OnBeginDocument(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrintout_base_OnEndDocument(_swigobj) (_swigobj->base_OnEndDocument()) +static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnEndDocument",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndDocument. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_base_OnEndDocument(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintout_base_OnBeginPrinting(_swigobj) (_swigobj->base_OnBeginPrinting()) +static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnBeginPrinting",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginPrinting. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_base_OnBeginPrinting(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintout_base_OnEndPrinting(_swigobj) (_swigobj->base_OnEndPrinting()) +static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnEndPrinting",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndPrinting. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_base_OnEndPrinting(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintout_base_OnPreparePrinting(_swigobj) (_swigobj->base_OnPreparePrinting()) +static PyObject *_wrap_wxPrintout_base_OnPreparePrinting(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnPreparePrinting",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnPreparePrinting. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_base_OnPreparePrinting(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintout_base_GetPageInfo(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_GetPageInfo(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _arg0; + int * _arg1; + int temp; + int * _arg2; + int temp0; + int * _arg3; + int temp1; + int * _arg4; + int temp2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} +{ + _arg3 = &temp1; +} +{ + _arg4 = &temp2; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_GetPageInfo",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_GetPageInfo. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintout_base_GetPageInfo(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg3)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg4)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxPrintout_base_HasPage(_swigobj,_swigarg0) (_swigobj->base_HasPage(_swigarg0)) +static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPyPrintout * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","page", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintout_base_HasPage",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_HasPage. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintout_base_HasPage(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static void *SwigwxPrinterTowxObject(void *ptr) { + wxPrinter *src; + wxObject *dest; + src = (wxPrinter *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxPrinter(_swigarg0) (new wxPrinter(_swigarg0)) +static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrinter * _result; + wxPrintDialogData * _arg0 = (wxPrintDialogData *) NULL; + PyObject * _argo0 = 0; + char *_kwnames[] = { "data", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxPrinter",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrinter. Expected _wxPrintDialogData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPrinter *)new_wxPrinter(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrinter_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxPrinter(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxPrinter(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrinter * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPrinter",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrinter. Expected _wxPrinter_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxPrinter(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrinter_CreateAbortWindow(_swigobj,_swigarg0,_swigarg1) (_swigobj->CreateAbortWindow(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrinter * _arg0; + wxWindow * _arg1; + wxPyPrintout * _arg2; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","parent","printout", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrinter_CreateAbortWindow",_kwnames,&_argo0,&_argo1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_CreateAbortWindow. Expected _wxPrinter_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_CreateAbortWindow. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_CreateAbortWindow. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrinter_CreateAbortWindow(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrinter_GetPrintDialogData(_swigobj) (_swigobj->GetPrintDialogData()) +static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintDialogData * _result; + wxPrinter * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrinter_GetPrintDialogData",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_GetPrintDialogData. Expected _wxPrinter_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintDialogData & _result_ref = wxPrinter_GetPrintDialogData(_arg0); + _result = (wxPrintDialogData *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPrinter_Print(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Print(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxPrinter_Print(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrinter * _arg0; + wxWindow * _arg1; + wxPyPrintout * _arg2; + int _arg3 = (int ) TRUE; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","parent","printout","prompt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|i:wxPrinter_Print",_kwnames,&_argo0,&_argo1,&_argo2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Print. Expected _wxPrinter_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Print. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_Print. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrinter_Print(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrinter_PrintDialog(_swigobj,_swigarg0) (_swigobj->PrintDialog(_swigarg0)) +static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _result; + wxPrinter * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","parent", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrinter_PrintDialog",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_PrintDialog. Expected _wxPrinter_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_PrintDialog. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxDC *)wxPrinter_PrintDialog(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + +#define wxPrinter_ReportError(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->ReportError(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxPrinter_ReportError(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrinter * _arg0; + wxWindow * _arg1; + wxPyPrintout * _arg2; + wxString * _arg3; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + PyObject * _obj3 = 0; + char *_kwnames[] = { "self","parent","printout","message", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxPrinter_ReportError",_kwnames,&_argo0,&_argo1,&_argo2,&_obj3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_ReportError. Expected _wxPrinter_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_ReportError. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_ReportError. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + _arg3 = wxString_in_helper(_obj3); + if (_arg3 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrinter_ReportError(_arg0,_arg1,_arg2,*_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj3) + delete _arg3; +} + return _resultobj; +} + +#define wxPrinter_Setup(_swigobj,_swigarg0) (_swigobj->Setup(_swigarg0)) +static PyObject *_wrap_wxPrinter_Setup(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrinter * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","parent", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrinter_Setup",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Setup. Expected _wxPrinter_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Setup. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrinter_Setup(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrinter_GetAbort(_swigobj) (_swigobj->GetAbort()) +static PyObject *_wrap_wxPrinter_GetAbort(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrinter * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrinter_GetAbort",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_GetAbort. Expected _wxPrinter_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrinter_GetAbort(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxPrinter_GetLastError(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrinterError _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxPrinter_GetLastError",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPrinterError )wxPrinter::GetLastError(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static void *SwigwxPrintAbortDialogTowxDialog(void *ptr) { + wxPrintAbortDialog *src; + wxDialog *dest; + src = (wxPrintAbortDialog *) ptr; + dest = (wxDialog *) src; + return (void *) dest; +} + +static void *SwigwxPrintAbortDialogTowxTopLevelWindow(void *ptr) { + wxPrintAbortDialog *src; + wxTopLevelWindow *dest; + src = (wxPrintAbortDialog *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + +static void *SwigwxPrintAbortDialogTowxWindow(void *ptr) { + wxPrintAbortDialog *src; + wxWindow *dest; + src = (wxPrintAbortDialog *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxPrintAbortDialogTowxEvtHandler(void *ptr) { + wxPrintAbortDialog *src; + wxEvtHandler *dest; + src = (wxPrintAbortDialog *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static void *SwigwxPrintAbortDialogTowxObject(void *ptr) { + wxPrintAbortDialog *src; + wxObject *dest; + src = (wxPrintAbortDialog *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxPrintAbortDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxPrintAbortDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxPrintAbortDialog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintAbortDialog * _result; + wxWindow * _arg0; + wxString * _arg1; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; + long _arg4 = (long ) 0; + wxString * _arg5 = (wxString *) &wxPyDialogNameStr; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "parent","title","pos","size","style","name", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|OOlO:new_wxPrintAbortDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3,&_arg4,&_obj5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintAbortDialog. Expected _wxWindow_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) + return NULL; +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj5) +{ + _arg5 = wxString_in_helper(_obj5); + if (_arg5 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPrintAbortDialog *)new_wxPrintAbortDialog(_arg0,*_arg1,*_arg2,*_arg3,_arg4,*_arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintAbortDialog_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj1) + delete _arg1; +} +{ + if (_obj5) + delete _arg5; +} + return _resultobj; +} + +static void *SwigwxPrintPreviewTowxObject(void *ptr) { + wxPrintPreview *src; + wxObject *dest; + src = (wxPrintPreview *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxPrintPreview(_swigarg0,_swigarg1,_swigarg2) (new wxPrintPreview(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintPreview * _result; + wxPyPrintout * _arg0; + wxPyPrintout * _arg1; + wxPrintData * _arg2 = (wxPrintData *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "printout","printoutForPrinting","data", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:new_wxPrintPreview",_kwnames,&_argo0,&_argo1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintPreview. Expected _wxPyPrintout_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintPreview. Expected _wxPyPrintout_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPrintData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPrintPreview. Expected _wxPrintData_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPrintPreview *)new_wxPrintPreview(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintPreview_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPrintPreview_SetCurrentPage(_swigobj,_swigarg0) (_swigobj->SetCurrentPage(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_SetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrintPreview * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pageNum", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_SetCurrentPage",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCurrentPage. Expected _wxPrintPreview_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintPreview_SetCurrentPage(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrintPreview_GetCurrentPage(_swigobj) (_swigobj->GetCurrentPage()) +static PyObject *_wrap_wxPrintPreview_GetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxPrintPreview * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetCurrentPage",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCurrentPage. Expected _wxPrintPreview_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxPrintPreview_GetCurrentPage(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrintPreview_SetPrintout(_swigobj,_swigarg0) (_swigobj->SetPrintout(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_SetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintPreview * _arg0; + wxPyPrintout * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","printout", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetPrintout",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetPrintout. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyPrintout_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetPrintout. Expected _wxPyPrintout_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintPreview_SetPrintout(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintPreview_GetPrintout(_swigobj) (_swigobj->GetPrintout()) +static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _result; + wxPrintPreview * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintout",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintout. Expected _wxPrintPreview_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPyPrintout *)wxPrintPreview_GetPrintout(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + +#define wxPrintPreview_GetPrintoutForPrinting(_swigobj) (_swigobj->GetPrintoutForPrinting()) +static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPrintout * _result; + wxPrintPreview * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintoutForPrinting",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintoutForPrinting. Expected _wxPrintPreview_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPyPrintout *)wxPrintPreview_GetPrintoutForPrinting(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + +#define wxPrintPreview_SetFrame(_swigobj,_swigarg0) (_swigobj->SetFrame(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_SetFrame(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintPreview * _arg0; + wxFrame * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","frame", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetFrame",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetFrame. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetFrame. Expected _wxFrame_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintPreview_SetFrame(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintPreview_SetCanvas(_swigobj,_swigarg0) (_swigobj->SetCanvas(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintPreview * _arg0; + wxPreviewCanvas * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","canvas", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetCanvas",_kwnames,&_argo0,&_argo1)) return NULL; - if (_obj0) + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCanvas. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetCanvas. Expected _wxPreviewCanvas_p."); + return NULL; + } + } { - _arg0 = wxString_in_helper(_obj0); - if (_arg0 == NULL) + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintPreview_SetCanvas(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPrintPreview_GetFrame(_swigobj) (_swigobj->GetFrame()) +static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFrame * _result; + wxPrintPreview * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetFrame",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetFrame. Expected _wxPrintPreview_p."); return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxFrame *)wxPrintPreview_GetFrame(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; } + +#define wxPrintPreview_GetCanvas(_swigobj) (_swigobj->GetCanvas()) +static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPreviewCanvas * _result; + wxPrintPreview * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetCanvas",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCanvas. Expected _wxPrintPreview_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPyPrintout *)new_wxPrintout(*_arg0); + _result = (wxPreviewCanvas *)wxPrintPreview_GetCanvas(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewCanvas_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); _resultobj = Py_None; } + return _resultobj; +} + +#define wxPrintPreview_PaintPage(_swigobj,_swigarg0,_swigarg1) (_swigobj->PaintPage(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintPreview_PaintPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrintPreview * _arg0; + wxPreviewCanvas * _arg1; + wxDC * _arg2; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","canvas","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrintPreview_PaintPage",_kwnames,&_argo0,&_argo1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_PaintPage. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_PaintPage. Expected _wxPreviewCanvas_p."); + return NULL; + } + } + if (_argo2) { + if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrintPreview_PaintPage. Expected _wxDC_p."); + return NULL; + } + } { - if (_obj0) - delete _arg0; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintPreview_PaintPage(_arg0,_arg1,*_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPrintPreview_DrawBlankPage(_swigobj,_swigarg0,_swigarg1) (_swigobj->DrawBlankPage(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintPreview_DrawBlankPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrintPreview * _arg0; + wxPreviewCanvas * _arg1; + wxDC * _arg2; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","canvas","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrintPreview_DrawBlankPage",_kwnames,&_argo0,&_argo1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_DrawBlankPage. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_DrawBlankPage. Expected _wxPreviewCanvas_p."); + return NULL; + } + } + if (_argo2) { + if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrintPreview_DrawBlankPage. Expected _wxDC_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintPreview_DrawBlankPage(_arg0,_arg1,*_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; } + +#define wxPrintPreview_RenderPage(_swigobj,_swigarg0) (_swigobj->RenderPage(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_RenderPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPrintPreview * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pageNum", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_RenderPage",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_RenderPage. Expected _wxPrintPreview_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPrintPreview_RenderPage(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintout__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrintout__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_AdjustScrollbars(_swigobj,_swigarg0) (_swigobj->AdjustScrollbars(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_AdjustScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; - PyObject * _arg1; - PyObject * _arg2; + wxPrintPreview * _arg0; + wxPreviewCanvas * _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","self","_class", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","canvas", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrintout__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_AdjustScrollbars",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout__setCallbackInfo. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_AdjustScrollbars. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_AdjustScrollbars. Expected _wxPreviewCanvas_p."); return NULL; } } { - _arg1 = _obj1; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintPreview_AdjustScrollbars(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; } + +#define wxPrintPreview_GetPrintDialogData(_swigobj) (_swigobj->GetPrintDialogData()) +static PyObject *_wrap_wxPrintPreview_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintDialogData * _result; + wxPrintPreview * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintDialogData",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintDialogData. Expected _wxPrintPreview_p."); + return NULL; + } + } { - _arg2 = _obj2; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPrintDialogData & _result_ref = wxPrintPreview_GetPrintDialogData(_arg0); + _result = (wxPrintDialogData *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; } + +#define wxPrintPreview_SetZoom(_swigobj,_swigarg0) (_swigobj->SetZoom(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_SetZoom(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPrintPreview * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","percent", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_SetZoom",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetZoom. Expected _wxPrintPreview_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout__setCallbackInfo(_arg0,_arg1,_arg2); + wxPrintPreview_SetZoom(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3910,332 +5836,354 @@ static PyObject *_wrap_wxPrintout__setCallbackInfo(PyObject *self, PyObject *arg return _resultobj; } -static void wxPyPrintout_Destroy(wxPyPrintout *self) { delete self; } -static PyObject *_wrap_wxPrintout_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_GetZoom(_swigobj) (_swigobj->GetZoom()) +static PyObject *_wrap_wxPrintPreview_GetZoom(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; + int _result; + wxPrintPreview * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_Destroy",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetZoom",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_Destroy. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetZoom. Expected _wxPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPyPrintout_Destroy(_arg0); + _result = (int )wxPrintPreview_GetZoom(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintout_GetDC(_swigobj) (_swigobj->GetDC()) -static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_GetMaxPage(_swigobj) (_swigobj->GetMaxPage()) +static PyObject *_wrap_wxPrintPreview_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxDC * _result; - wxPyPrintout * _arg0; + int _result; + wxPrintPreview * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetDC",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetMaxPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetDC. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMaxPage. Expected _wxPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxDC *)wxPrintout_GetDC(_arg0); + _result = (int )wxPrintPreview_GetMaxPage(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintout_GetPageSizeMM(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPageSizeMM(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_GetMinPage(_swigobj) (_swigobj->GetMinPage()) +static PyObject *_wrap_wxPrintPreview_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; - int * _arg1; - int temp; - int * _arg2; - int temp0; + int _result; + wxPrintPreview * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; -{ - _arg1 = &temp; -} -{ - _arg2 = &temp0; -} - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPageSizeMM",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetMinPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizeMM. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMinPage. Expected _wxPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_GetPageSizeMM(_arg0,_arg1,_arg2); + _result = (int )wxPrintPreview_GetMinPage(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg1)); - _resultobj = t_output_helper(_resultobj, o); -} -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); -} +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintout_GetPageSizePixels(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPageSizePixels(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_Ok(_swigobj) (_swigobj->Ok()) +static PyObject *_wrap_wxPrintPreview_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; - int * _arg1; - int temp; - int * _arg2; - int temp0; + bool _result; + wxPrintPreview * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; -{ - _arg1 = &temp; -} -{ - _arg2 = &temp0; -} - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPageSizePixels",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPageSizePixels. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Ok. Expected _wxPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_GetPageSizePixels(_arg0,_arg1,_arg2); + _result = (bool )wxPrintPreview_Ok(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg1)); - _resultobj = t_output_helper(_resultobj, o); -} -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); -} +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintout_GetPPIPrinter(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPPIPrinter(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_SetOk(_swigobj,_swigarg0) (_swigobj->SetOk(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_SetOk(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; - int * _arg1; - int temp; - int * _arg2; - int temp0; + wxPrintPreview * _arg0; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + int tempbool1; + char *_kwnames[] = { "self","ok", NULL }; self = self; -{ - _arg1 = &temp; -} -{ - _arg2 = &temp0; -} - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPPIPrinter",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_SetOk",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIPrinter. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetOk. Expected _wxPrintPreview_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_GetPPIPrinter(_arg0,_arg1,_arg2); + wxPrintPreview_SetOk(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg1)); - _resultobj = t_output_helper(_resultobj, o); -} -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); -} return _resultobj; } -#define wxPrintout_GetPPIScreen(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPPIScreen(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_Print(_swigobj,_swigarg0) (_swigobj->Print(_swigarg0)) +static PyObject *_wrap_wxPrintPreview_Print(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; - int * _arg1; - int temp; - int * _arg2; - int temp0; + bool _result; + wxPrintPreview * _arg0; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + int tempbool1; + char *_kwnames[] = { "self","interactive", NULL }; self = self; -{ - _arg1 = &temp; -} -{ - _arg2 = &temp0; -} - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPPIScreen",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_Print",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_GetPPIScreen. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Print. Expected _wxPrintPreview_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_GetPPIScreen(_arg0,_arg1,_arg2); + _result = (bool )wxPrintPreview_Print(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg1)); - _resultobj = t_output_helper(_resultobj, o); -} -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); -} +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintout_IsPreview(_swigobj) (_swigobj->IsPreview()) -static PyObject *_wrap_wxPrintout_IsPreview(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintPreview_DetermineScaling(_swigobj) (_swigobj->DetermineScaling()) +static PyObject *_wrap_wxPrintPreview_DetermineScaling(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxPyPrintout * _arg0; + wxPrintPreview * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_IsPreview",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_DetermineScaling",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_IsPreview. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_DetermineScaling. Expected _wxPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintout_IsPreview(_arg0); + wxPrintPreview_DetermineScaling(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintout_base_OnBeginDocument(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnBeginDocument(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrintout_base_OnBeginDocument(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxPreviewFrameTowxFrame(void *ptr) { + wxPreviewFrame *src; + wxFrame *dest; + src = (wxPreviewFrame *) ptr; + dest = (wxFrame *) src; + return (void *) dest; +} + +static void *SwigwxPreviewFrameTowxTopLevelWindow(void *ptr) { + wxPreviewFrame *src; + wxTopLevelWindow *dest; + src = (wxPreviewFrame *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + +static void *SwigwxPreviewFrameTowxWindow(void *ptr) { + wxPreviewFrame *src; + wxWindow *dest; + src = (wxPreviewFrame *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxPreviewFrameTowxEvtHandler(void *ptr) { + wxPreviewFrame *src; + wxEvtHandler *dest; + src = (wxPreviewFrame *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static void *SwigwxPreviewFrameTowxObject(void *ptr) { + wxPreviewFrame *src; + wxObject *dest; + src = (wxPreviewFrame *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) +static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxPyPrintout * _arg0; - int _arg1; - int _arg2; + wxPreviewFrame * _result; + wxPrintPreview * _arg0; + wxFrame * _arg1; + wxString * _arg2; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; + long _arg5 = (long ) wxDEFAULT_FRAME_STYLE; + wxString * _arg6 = (wxString *) &wxPyFrameNameStr; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","startPage","endPage", NULL }; + PyObject * _argo1 = 0; + PyObject * _obj2 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "preview","parent","title","pos","size","style","name", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxPrintout_base_OnBeginDocument",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|OOlO:new_wxPreviewFrame",_kwnames,&_argo0,&_argo1,&_obj2,&_obj3,&_obj4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginDocument. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPreviewFrame. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPreviewFrame. Expected _wxFrame_p."); return NULL; } } +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) + return NULL; +} + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) + return NULL; +} + if (_obj6) +{ + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintout_base_OnBeginDocument(_arg0,_arg1,_arg2); + _result = (wxPreviewFrame *)new_wxPreviewFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewFrame_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj2) + delete _arg2; +} +{ + if (_obj6) + delete _arg6; +} return _resultobj; } -#define wxPrintout_base_OnEndDocument(_swigobj) (_swigobj->base_OnEndDocument()) -static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewFrame_Initialize(_swigobj) (_swigobj->Initialize()) +static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; + wxPreviewFrame * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnEndDocument",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewFrame_Initialize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndDocument. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewFrame_Initialize. Expected _wxPreviewFrame_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_base_OnEndDocument(_arg0); + wxPreviewFrame_Initialize(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4244,26 +6192,26 @@ static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *a return _resultobj; } -#define wxPrintout_base_OnBeginPrinting(_swigobj) (_swigobj->base_OnBeginPrinting()) -static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewFrame_CreateControlBar(_swigobj) (_swigobj->CreateControlBar()) +static PyObject *_wrap_wxPreviewFrame_CreateControlBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; + wxPreviewFrame * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnBeginPrinting",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewFrame_CreateControlBar",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnBeginPrinting. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewFrame_CreateControlBar. Expected _wxPreviewFrame_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_base_OnBeginPrinting(_arg0); + wxPreviewFrame_CreateControlBar(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4272,26 +6220,26 @@ static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject return _resultobj; } -#define wxPrintout_base_OnEndPrinting(_swigobj) (_swigobj->base_OnEndPrinting()) -static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewFrame_CreateCanvas(_swigobj) (_swigobj->CreateCanvas()) +static PyObject *_wrap_wxPreviewFrame_CreateCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; + wxPreviewFrame * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnEndPrinting",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewFrame_CreateCanvas",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnEndPrinting. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewFrame_CreateCanvas. Expected _wxPreviewFrame_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_base_OnEndPrinting(_arg0); + wxPreviewFrame_CreateCanvas(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4300,240 +6248,313 @@ static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *a return _resultobj; } -#define wxPrintout_base_OnPreparePrinting(_swigobj) (_swigobj->base_OnPreparePrinting()) -static PyObject *_wrap_wxPrintout_base_OnPreparePrinting(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewFrame_GetControlBar(_swigobj) (_swigobj->GetControlBar()) +static PyObject *_wrap_wxPreviewFrame_GetControlBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _arg0; + wxPreviewControlBar * _result; + wxPreviewFrame * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnPreparePrinting",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewFrame_GetControlBar",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_OnPreparePrinting. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewFrame_GetControlBar. Expected _wxPreviewFrame_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_base_OnPreparePrinting(_arg0); + _result = (wxPreviewControlBar *)wxPreviewFrame_GetControlBar(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewControlBar_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxPrintout_base_GetPageInfo(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_GetPageInfo(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxPyPrintout * _arg0; - int * _arg1; - int temp; - int * _arg2; - int temp0; - int * _arg3; - int temp1; - int * _arg4; - int temp2; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; +static void *SwigwxPreviewCanvasTowxScrolledWindow(void *ptr) { + wxPreviewCanvas *src; + wxScrolledWindow *dest; + src = (wxPreviewCanvas *) ptr; + dest = (wxScrolledWindow *) src; + return (void *) dest; +} - self = self; -{ - _arg1 = &temp; +static void *SwigwxPreviewCanvasTowxPanel(void *ptr) { + wxPreviewCanvas *src; + wxPanel *dest; + src = (wxPreviewCanvas *) ptr; + dest = (wxPanel *) src; + return (void *) dest; } -{ - _arg2 = &temp0; + +static void *SwigwxPreviewCanvasTowxWindow(void *ptr) { + wxPreviewCanvas *src; + wxWindow *dest; + src = (wxPreviewCanvas *) ptr; + dest = (wxWindow *) src; + return (void *) dest; } -{ - _arg3 = &temp1; + +static void *SwigwxPreviewCanvasTowxEvtHandler(void *ptr) { + wxPreviewCanvas *src; + wxEvtHandler *dest; + src = (wxPreviewCanvas *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; } -{ - _arg4 = &temp2; + +static void *SwigwxPreviewCanvasTowxObject(void *ptr) { + wxPreviewCanvas *src; + wxObject *dest; + src = (wxPreviewCanvas *) ptr; + dest = (wxObject *) src; + return (void *) dest; } - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_GetPageInfo",_kwnames,&_argo0)) + +#define new_wxPreviewCanvas(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxPreviewCanvas(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxPreviewCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPreviewCanvas * _result; + wxPrintPreview * _arg0; + wxWindow * _arg1; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; + long _arg4 = (long ) 0; + wxString * _arg5 = (wxString *) &wxPyPreviewCanvasNameStr; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "preview","parent","pos","size","style","name", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|OOlO:new_wxPreviewCanvas",_kwnames,&_argo0,&_argo1,&_obj2,&_obj3,&_arg4,&_obj5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_GetPageInfo. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPreviewCanvas. Expected _wxPrintPreview_p."); return NULL; } } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPreviewCanvas. Expected _wxWindow_p."); + return NULL; + } + } + if (_obj2) { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintout_base_GetPageInfo(_arg0,_arg1,_arg2,_arg3,_arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg1)); - _resultobj = t_output_helper(_resultobj, o); + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) + return NULL; } + if (_obj3) { - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) + return NULL; } + if (_obj5) { - PyObject *o; - o = PyInt_FromLong((long) (*_arg3)); - _resultobj = t_output_helper(_resultobj, o); + _arg5 = wxString_in_helper(_obj5); + if (_arg5 == NULL) + return NULL; } { - PyObject *o; - o = PyInt_FromLong((long) (*_arg4)); - _resultobj = t_output_helper(_resultobj, o); + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPreviewCanvas *)new_wxPreviewCanvas(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewCanvas_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj5) + delete _arg5; } return _resultobj; } -#define wxPrintout_base_HasPage(_swigobj,_swigarg0) (_swigobj->base_HasPage(_swigarg0)) -static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxPyPrintout * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; +static void *SwigwxPreviewControlBarTowxPanel(void *ptr) { + wxPreviewControlBar *src; + wxPanel *dest; + src = (wxPreviewControlBar *) ptr; + dest = (wxPanel *) src; + return (void *) dest; +} - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintout_base_HasPage",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout_base_HasPage. Expected _wxPyPrintout_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintout_base_HasPage(_arg0,_arg1); +static void *SwigwxPreviewControlBarTowxWindow(void *ptr) { + wxPreviewControlBar *src; + wxWindow *dest; + src = (wxPreviewControlBar *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; +static void *SwigwxPreviewControlBarTowxEvtHandler(void *ptr) { + wxPreviewControlBar *src; + wxEvtHandler *dest; + src = (wxPreviewControlBar *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; } -static void *SwigwxPrinterTowxObject(void *ptr) { - wxPrinter *src; +static void *SwigwxPreviewControlBarTowxObject(void *ptr) { + wxPreviewControlBar *src; wxObject *dest; - src = (wxPrinter *) ptr; + src = (wxPreviewControlBar *) ptr; dest = (wxObject *) src; return (void *) dest; } -#define new_wxPrinter(_swigarg0) (new wxPrinter(_swigarg0)) -static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxPreviewControlBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPreviewControlBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) +static PyObject *_wrap_new_wxPreviewControlBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrinter * _result; - wxPrintDialogData * _arg0 = (wxPrintDialogData *) NULL; + wxPreviewControlBar * _result; + wxPrintPreview * _arg0; + long _arg1; + wxWindow * _arg2; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; + long _arg5 = (long ) wxTAB_TRAVERSAL; + wxString * _arg6 = (wxString *) &wxPyPanelNameStr; PyObject * _argo0 = 0; - char *_kwnames[] = { "data", NULL }; + PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "preview","buttons","parent","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxPrinter",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO|OOlO:new_wxPreviewControlBar",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintDialogData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrinter. Expected _wxPrintDialogData_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPreviewControlBar. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPreviewControlBar. Expected _wxWindow_p."); return NULL; } } + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) + return NULL; +} + if (_obj6) +{ + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPrinter *)new_wxPrinter(_arg0); + _result = (wxPreviewControlBar *)new_wxPreviewControlBar(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrinter_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewControlBar_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); _resultobj = Py_None; } +{ + if (_obj6) + delete _arg6; +} return _resultobj; } -#define delete_wxPrinter(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxPrinter(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewControlBar_GetZoomControl(_swigobj) (_swigobj->GetZoomControl()) +static PyObject *_wrap_wxPreviewControlBar_GetZoomControl(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrinter * _arg0; + int _result; + wxPreviewControlBar * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPrinter",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewControlBar_GetZoomControl",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPrinter. Expected _wxPrinter_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_GetZoomControl. Expected _wxPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete_wxPrinter(_arg0); + _result = (int )wxPreviewControlBar_GetZoomControl(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrinter_CreateAbortWindow(_swigobj,_swigarg0,_swigarg1) (_swigobj->CreateAbortWindow(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewControlBar_SetZoomControl(_swigobj,_swigarg0) (_swigobj->SetZoomControl(_swigarg0)) +static PyObject *_wrap_wxPreviewControlBar_SetZoomControl(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrinter * _arg0; - wxWindow * _arg1; - wxPyPrintout * _arg2; + wxPreviewControlBar * _arg0; + int _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","parent","printout", NULL }; + char *_kwnames[] = { "self","zoom", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrinter_CreateAbortWindow",_kwnames,&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPreviewControlBar_SetZoomControl",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_CreateAbortWindow. Expected _wxPrinter_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_CreateAbortWindow. Expected _wxWindow_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_CreateAbortWindow. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_SetZoomControl. Expected _wxPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrinter_CreateAbortWindow(_arg0,_arg1,_arg2); + wxPreviewControlBar_SetZoomControl(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4542,34 +6563,33 @@ static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *arg return _resultobj; } -#define wxPrinter_GetPrintDialogData(_swigobj) (_swigobj->GetPrintDialogData()) -static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewControlBar_GetPrintPreview(_swigobj) (_swigobj->GetPrintPreview()) +static PyObject *_wrap_wxPreviewControlBar_GetPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintDialogData * _result; - wxPrinter * _arg0; + wxPrintPreview * _result; + wxPreviewControlBar * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrinter_GetPrintDialogData",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewControlBar_GetPrintPreview",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_GetPrintDialogData. Expected _wxPrinter_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_GetPrintPreview. Expected _wxPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData & _result_ref = wxPrinter_GetPrintDialogData(_arg0); - _result = (wxPrintDialogData *) &_result_ref; + _result = (wxPrintPreview *)wxPreviewControlBar_GetPrintPreview(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintPreview_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -4578,196 +6598,166 @@ static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *ar return _resultobj; } -#define wxPrinter_Print(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Print(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxPrinter_Print(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewControlBar_OnNext(_swigobj) (_swigobj->OnNext()) +static PyObject *_wrap_wxPreviewControlBar_OnNext(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxPrinter * _arg0; - wxWindow * _arg1; - wxPyPrintout * _arg2; - int _arg3 = (int ) TRUE; + wxPreviewControlBar * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - char *_kwnames[] = { "self","parent","printout","prompt", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|i:wxPrinter_Print",_kwnames,&_argo0,&_argo1,&_argo2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewControlBar_OnNext",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Print. Expected _wxPrinter_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Print. Expected _wxWindow_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_Print. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_OnNext. Expected _wxPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrinter_Print(_arg0,_arg1,_arg2,_arg3); + wxPreviewControlBar_OnNext(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrinter_PrintDialog(_swigobj,_swigarg0) (_swigobj->PrintDialog(_swigarg0)) -static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewControlBar_OnPrevious(_swigobj) (_swigobj->OnPrevious()) +static PyObject *_wrap_wxPreviewControlBar_OnPrevious(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxDC * _result; - wxPrinter * _arg0; - wxWindow * _arg1; + wxPreviewControlBar * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","parent", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrinter_PrintDialog",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewControlBar_OnPrevious",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_PrintDialog. Expected _wxPrinter_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_PrintDialog. Expected _wxWindow_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_OnPrevious. Expected _wxPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxDC *)wxPrinter_PrintDialog(_arg0,_arg1); + wxPreviewControlBar_OnPrevious(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrinter_ReportError(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->ReportError(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxPrinter_ReportError(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewControlBar_OnFirst(_swigobj) (_swigobj->OnFirst()) +static PyObject *_wrap_wxPreviewControlBar_OnFirst(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrinter * _arg0; - wxWindow * _arg1; - wxPyPrintout * _arg2; - wxString * _arg3; + wxPreviewControlBar * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - PyObject * _obj3 = 0; - char *_kwnames[] = { "self","parent","printout","message", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxPrinter_ReportError",_kwnames,&_argo0,&_argo1,&_argo2,&_obj3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewControlBar_OnFirst",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_ReportError. Expected _wxPrinter_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_OnFirst. Expected _wxPreviewControlBar_p."); return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_ReportError. Expected _wxWindow_p."); +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPreviewControlBar_OnFirst(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPreviewControlBar_OnLast(_swigobj) (_swigobj->OnLast()) +static PyObject *_wrap_wxPreviewControlBar_OnLast(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPreviewControlBar * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewControlBar_OnLast",_kwnames,&_argo0)) return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPrinter_ReportError. Expected _wxPyPrintout_p."); + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_OnLast. Expected _wxPreviewControlBar_p."); return NULL; } } -{ - _arg3 = wxString_in_helper(_obj3); - if (_arg3 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrinter_ReportError(_arg0,_arg1,_arg2,*_arg3); + wxPreviewControlBar_OnLast(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; -{ - if (_obj3) - delete _arg3; -} return _resultobj; } -#define wxPrinter_Setup(_swigobj,_swigarg0) (_swigobj->Setup(_swigarg0)) -static PyObject *_wrap_wxPrinter_Setup(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPreviewControlBar_OnGoto(_swigobj) (_swigobj->OnGoto()) +static PyObject *_wrap_wxPreviewControlBar_OnGoto(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxPrinter * _arg0; - wxWindow * _arg1; + wxPreviewControlBar * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","parent", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrinter_Setup",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewControlBar_OnGoto",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrinter_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrinter_Setup. Expected _wxPrinter_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrinter_Setup. Expected _wxWindow_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewControlBar_OnGoto. Expected _wxPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrinter_Setup(_arg0,_arg1); + wxPreviewControlBar_OnGoto(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -static void *SwigwxPrintPreviewTowxObject(void *ptr) { - wxPrintPreview *src; +static void *SwigwxPyPrintPreviewTowxPrintPreview(void *ptr) { + wxPyPrintPreview *src; + wxPrintPreview *dest; + src = (wxPyPrintPreview *) ptr; + dest = (wxPrintPreview *) src; + return (void *) dest; +} + +static void *SwigwxPyPrintPreviewTowxObject(void *ptr) { + wxPyPrintPreview *src; wxObject *dest; - src = (wxPrintPreview *) ptr; + src = (wxPyPrintPreview *) ptr; dest = (wxObject *) src; return (void *) dest; } -#define new_wxPrintPreview(_swigarg0,_swigarg1,_swigarg2) (new wxPrintPreview(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxPyPrintPreview(_swigarg0,_swigarg1,_swigarg2) (new wxPyPrintPreview(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_new_wxPyPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintPreview * _result; + wxPyPrintPreview * _result; wxPyPrintout * _arg0; wxPyPrintout * _arg1; wxPrintData * _arg2 = (wxPrintData *) NULL; @@ -4778,37 +6768,37 @@ static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args, PyObje char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:new_wxPrintPreview",_kwnames,&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:new_wxPyPrintPreview",_kwnames,&_argo0,&_argo1,&_argo2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPrintPreview. Expected _wxPyPrintout_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPyPrintPreview. Expected _wxPyPrintout_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPrintPreview. Expected _wxPyPrintout_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPyPrintPreview. Expected _wxPyPrintout_p."); return NULL; } } if (_argo2) { if (_argo2 == Py_None) { _arg2 = NULL; } else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPrintData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPrintPreview. Expected _wxPrintData_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPyPrintPreview. Expected _wxPrintData_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPrintPreview *)new_wxPrintPreview(_arg0,_arg1,_arg2); + _result = (wxPyPrintPreview *)new_wxPyPrintPreview(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintPreview_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintPreview_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -4817,111 +6807,111 @@ static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxPrintPreview_GetCanvas(_swigobj) (_swigobj->GetCanvas()) -static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxWindow * _result; - wxPrintPreview * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetCanvas",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCanvas. Expected _wxPrintPreview_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxWindow *)wxPrintPreview_GetCanvas(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } - return _resultobj; -} - -#define wxPrintPreview_GetCurrentPage(_swigobj) (_swigobj->GetCurrentPage()) -static PyObject *_wrap_wxPrintPreview_GetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyPrintPreview__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxPrintPreview * _arg0; + wxPyPrintPreview * _arg0; + PyObject * _arg1; + PyObject * _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","self","_class", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetCurrentPage",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyPrintPreview__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetCurrentPage. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview__setCallbackInfo. Expected _wxPyPrintPreview_p."); return NULL; } } +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintPreview_GetCurrentPage(_arg0); + wxPyPrintPreview__setCallbackInfo(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintPreview_GetFrame(_swigobj) (_swigobj->GetFrame()) -static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview_base_SetCurrentPage(_swigobj,_swigarg0) (_swigobj->base_SetCurrentPage(_swigarg0)) +static PyObject *_wrap_wxPyPrintPreview_base_SetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxFrame * _result; - wxPrintPreview * _arg0; + bool _result; + wxPyPrintPreview * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","pageNum", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetFrame",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyPrintPreview_base_SetCurrentPage",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetFrame. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview_base_SetCurrentPage. Expected _wxPyPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxFrame *)wxPrintPreview_GetFrame(_arg0); + _result = (bool )wxPyPrintPreview_base_SetCurrentPage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintPreview_GetMaxPage(_swigobj) (_swigobj->GetMaxPage()) -static PyObject *_wrap_wxPrintPreview_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview_base_PaintPage(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_PaintPage(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyPrintPreview_base_PaintPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxPrintPreview * _arg0; + bool _result; + wxPyPrintPreview * _arg0; + wxPreviewCanvas * _arg1; + wxDC * _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","canvas","dc", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetMaxPage",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyPrintPreview_base_PaintPage",_kwnames,&_argo0,&_argo1,&_argo2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMaxPage. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview_base_PaintPage. Expected _wxPyPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPrintPreview_base_PaintPage. Expected _wxPreviewCanvas_p."); + return NULL; + } + } + if (_argo2) { + if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyPrintPreview_base_PaintPage. Expected _wxDC_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintPreview_GetMaxPage(_arg0); + _result = (bool )wxPyPrintPreview_base_PaintPage(_arg0,_arg1,*_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4929,27 +6919,44 @@ static PyObject *_wrap_wxPrintPreview_GetMaxPage(PyObject *self, PyObject *args, return _resultobj; } -#define wxPrintPreview_GetMinPage(_swigobj) (_swigobj->GetMinPage()) -static PyObject *_wrap_wxPrintPreview_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview_base_DrawBlankPage(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_DrawBlankPage(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyPrintPreview_base_DrawBlankPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxPrintPreview * _arg0; + bool _result; + wxPyPrintPreview * _arg0; + wxPreviewCanvas * _arg1; + wxDC * _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","canvas","dc", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetMinPage",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyPrintPreview_base_DrawBlankPage",_kwnames,&_argo0,&_argo1,&_argo2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetMinPage. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview_base_DrawBlankPage. Expected _wxPyPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPrintPreview_base_DrawBlankPage. Expected _wxPreviewCanvas_p."); + return NULL; + } + } + if (_argo2) { + if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyPrintPreview_base_DrawBlankPage. Expected _wxDC_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintPreview_GetMinPage(_arg0); + _result = (bool )wxPyPrintPreview_base_DrawBlankPage(_arg0,_arg1,*_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -4957,214 +6964,324 @@ static PyObject *_wrap_wxPrintPreview_GetMinPage(PyObject *self, PyObject *args, return _resultobj; } -#define wxPrintPreview_GetPrintDialogData(_swigobj) (_swigobj->GetPrintDialogData()) -static PyObject *_wrap_wxPrintPreview_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview_base_RenderPage(_swigobj,_swigarg0) (_swigobj->base_RenderPage(_swigarg0)) +static PyObject *_wrap_wxPyPrintPreview_base_RenderPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintDialogData * _result; - wxPrintPreview * _arg0; + bool _result; + wxPyPrintPreview * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","pageNum", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintDialogData",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyPrintPreview_base_RenderPage",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintDialogData. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview_base_RenderPage. Expected _wxPyPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintDialogData & _result_ref = wxPrintPreview_GetPrintDialogData(_arg0); - _result = (wxPrintDialogData *) &_result_ref; + _result = (bool )wxPyPrintPreview_base_RenderPage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrintDialogData_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintPreview_GetPrintout(_swigobj) (_swigobj->GetPrintout()) -static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview_base_SetZoom(_swigobj,_swigarg0) (_swigobj->base_SetZoom(_swigarg0)) +static PyObject *_wrap_wxPyPrintPreview_base_SetZoom(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _result; - wxPrintPreview * _arg0; + wxPyPrintPreview * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","percent", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintout",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyPrintPreview_base_SetZoom",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintout. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview_base_SetZoom. Expected _wxPyPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPyPrintout *)wxPrintPreview_GetPrintout(_arg0); + wxPyPrintPreview_base_SetZoom(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintPreview_GetPrintoutForPrinting(_swigobj) (_swigobj->GetPrintoutForPrinting()) -static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview_base_Print(_swigobj,_swigarg0) (_swigobj->base_Print(_swigarg0)) +static PyObject *_wrap_wxPyPrintPreview_base_Print(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyPrintout * _result; - wxPrintPreview * _arg0; + bool _result; + wxPyPrintPreview * _arg0; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + int tempbool1; + char *_kwnames[] = { "self","interactive", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintoutForPrinting",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyPrintPreview_base_Print",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetPrintoutForPrinting. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview_base_Print. Expected _wxPyPrintPreview_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPyPrintout *)wxPrintPreview_GetPrintoutForPrinting(_arg0); + _result = (bool )wxPyPrintPreview_base_Print(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPrintPreview_GetZoom(_swigobj) (_swigobj->GetZoom()) -static PyObject *_wrap_wxPrintPreview_GetZoom(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPrintPreview_base_DetermineScaling(_swigobj) (_swigobj->base_DetermineScaling()) +static PyObject *_wrap_wxPyPrintPreview_base_DetermineScaling(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxPrintPreview * _arg0; + wxPyPrintPreview * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetZoom",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyPrintPreview_base_DetermineScaling",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_GetZoom. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPrintPreview_base_DetermineScaling. Expected _wxPyPrintPreview_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPrintPreview_GetZoom(_arg0); + wxPyPrintPreview_base_DetermineScaling(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintPreview_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxPrintPreview_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxPyPreviewFrameTowxPreviewFrame(void *ptr) { + wxPyPreviewFrame *src; + wxPreviewFrame *dest; + src = (wxPyPreviewFrame *) ptr; + dest = (wxPreviewFrame *) src; + return (void *) dest; +} + +static void *SwigwxPyPreviewFrameTowxFrame(void *ptr) { + wxPyPreviewFrame *src; + wxFrame *dest; + src = (wxPyPreviewFrame *) ptr; + dest = (wxFrame *) src; + return (void *) dest; +} + +static void *SwigwxPyPreviewFrameTowxTopLevelWindow(void *ptr) { + wxPyPreviewFrame *src; + wxTopLevelWindow *dest; + src = (wxPyPreviewFrame *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + +static void *SwigwxPyPreviewFrameTowxWindow(void *ptr) { + wxPyPreviewFrame *src; + wxWindow *dest; + src = (wxPyPreviewFrame *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxPyPreviewFrameTowxEvtHandler(void *ptr) { + wxPyPreviewFrame *src; + wxEvtHandler *dest; + src = (wxPyPreviewFrame *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static void *SwigwxPyPreviewFrameTowxObject(void *ptr) { + wxPyPreviewFrame *src; + wxObject *dest; + src = (wxPyPreviewFrame *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxPyPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPyPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) +static PyObject *_wrap_new_wxPyPreviewFrame(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; + wxPyPreviewFrame * _result; wxPrintPreview * _arg0; + wxFrame * _arg1; + wxString * _arg2; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; + long _arg5 = (long ) wxDEFAULT_FRAME_STYLE; + wxString * _arg6 = (wxString *) &wxPyFrameNameStr; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo1 = 0; + PyObject * _obj2 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "preview","parent","title","pos","size","style","name", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_Ok",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|OOlO:new_wxPyPreviewFrame",_kwnames,&_argo0,&_argo1,&_obj2,&_obj3,&_obj4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Ok. Expected _wxPrintPreview_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPyPreviewFrame. Expected _wxPrintPreview_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPyPreviewFrame. Expected _wxFrame_p."); return NULL; } } +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) + return NULL; +} + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) + return NULL; +} + if (_obj6) +{ + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintPreview_Ok(_arg0); + _result = (wxPyPreviewFrame *)new_wxPyPreviewFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPreviewFrame_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj2) + delete _arg2; +} +{ + if (_obj6) + delete _arg6; +} return _resultobj; } -#define wxPrintPreview_Print(_swigobj,_swigarg0) (_swigobj->Print(_swigarg0)) -static PyObject *_wrap_wxPrintPreview_Print(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPreviewFrame__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyPreviewFrame__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxPrintPreview * _arg0; - bool _arg1; + wxPyPreviewFrame * _arg0; + PyObject * _arg1; + PyObject * _arg2; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","prompt", NULL }; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","self","_class", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_Print",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyPreviewFrame__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_Print. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewFrame__setCallbackInfo. Expected _wxPyPreviewFrame_p."); return NULL; } } - _arg1 = (bool ) tempbool1; +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPrintPreview_Print(_arg0,_arg1); + wxPyPreviewFrame__setCallbackInfo(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPrintPreview_SetCanvas(_swigobj,_swigarg0) (_swigobj->SetCanvas(_swigarg0)) -static PyObject *_wrap_wxPrintPreview_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPreviewFrame_SetPreviewCanvas(_swigobj,_swigarg0) (_swigobj->SetPreviewCanvas(_swigarg0)) +static PyObject *_wrap_wxPyPreviewFrame_SetPreviewCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintPreview * _arg0; - wxWindow * _arg1; + wxPyPreviewFrame * _arg0; + wxPreviewCanvas * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "self","window", NULL }; + char *_kwnames[] = { "self","canvas", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetCanvas",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyPreviewFrame_SetPreviewCanvas",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCanvas. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewFrame_SetPreviewCanvas. Expected _wxPyPreviewFrame_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetCanvas. Expected _wxWindow_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPreviewFrame_SetPreviewCanvas. Expected _wxPreviewCanvas_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintPreview_SetCanvas(_arg0,_arg1); + wxPyPreviewFrame_SetPreviewCanvas(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5173,27 +7290,35 @@ static PyObject *_wrap_wxPrintPreview_SetCanvas(PyObject *self, PyObject *args, return _resultobj; } -#define wxPrintPreview_SetCurrentPage(_swigobj,_swigarg0) (_swigobj->SetCurrentPage(_swigarg0)) -static PyObject *_wrap_wxPrintPreview_SetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPreviewFrame_SetControlBar(_swigobj,_swigarg0) (_swigobj->SetControlBar(_swigarg0)) +static PyObject *_wrap_wxPyPreviewFrame_SetControlBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintPreview * _arg0; - int _arg1; + wxPyPreviewFrame * _arg0; + wxPreviewControlBar * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pageNum", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bar", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_SetCurrentPage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyPreviewFrame_SetControlBar",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetCurrentPage. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewFrame_SetControlBar. Expected _wxPyPreviewFrame_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPreviewFrame_SetControlBar. Expected _wxPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintPreview_SetCurrentPage(_arg0,_arg1); + wxPyPreviewFrame_SetControlBar(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5202,35 +7327,26 @@ static PyObject *_wrap_wxPrintPreview_SetCurrentPage(PyObject *self, PyObject *a return _resultobj; } -#define wxPrintPreview_SetFrame(_swigobj,_swigarg0) (_swigobj->SetFrame(_swigarg0)) -static PyObject *_wrap_wxPrintPreview_SetFrame(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPreviewFrame_base_Initialize(_swigobj) (_swigobj->base_Initialize()) +static PyObject *_wrap_wxPyPreviewFrame_base_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintPreview * _arg0; - wxFrame * _arg1; + wxPyPreviewFrame * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","frame", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetFrame",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyPreviewFrame_base_Initialize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetFrame. Expected _wxPrintPreview_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetFrame. Expected _wxFrame_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewFrame_base_Initialize. Expected _wxPyPreviewFrame_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintPreview_SetFrame(_arg0,_arg1); + wxPyPreviewFrame_base_Initialize(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5239,35 +7355,26 @@ static PyObject *_wrap_wxPrintPreview_SetFrame(PyObject *self, PyObject *args, P return _resultobj; } -#define wxPrintPreview_SetPrintout(_swigobj,_swigarg0) (_swigobj->SetPrintout(_swigarg0)) -static PyObject *_wrap_wxPrintPreview_SetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPreviewFrame_base_CreateCanvas(_swigobj) (_swigobj->base_CreateCanvas()) +static PyObject *_wrap_wxPyPreviewFrame_base_CreateCanvas(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintPreview * _arg0; - wxPyPrintout * _arg1; + wxPyPreviewFrame * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","printout", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetPrintout",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyPreviewFrame_base_CreateCanvas",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetPrintout. Expected _wxPrintPreview_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintPreview_SetPrintout. Expected _wxPyPrintout_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewFrame_base_CreateCanvas. Expected _wxPyPreviewFrame_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintPreview_SetPrintout(_arg0,_arg1); + wxPyPreviewFrame_base_CreateCanvas(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5276,27 +7383,26 @@ static PyObject *_wrap_wxPrintPreview_SetPrintout(PyObject *self, PyObject *args return _resultobj; } -#define wxPrintPreview_SetZoom(_swigobj,_swigarg0) (_swigobj->SetZoom(_swigarg0)) -static PyObject *_wrap_wxPrintPreview_SetZoom(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPreviewFrame_base_CreateControlBar(_swigobj) (_swigobj->base_CreateControlBar()) +static PyObject *_wrap_wxPyPreviewFrame_base_CreateControlBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPrintPreview * _arg0; - int _arg1; + wxPyPreviewFrame * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","percent", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_SetZoom",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyPreviewFrame_base_CreateControlBar",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintPreview_SetZoom. Expected _wxPrintPreview_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewFrame_base_CreateControlBar. Expected _wxPyPreviewFrame_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPrintPreview_SetZoom(_arg0,_arg1); + wxPyPreviewFrame_base_CreateControlBar(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5305,90 +7411,84 @@ static PyObject *_wrap_wxPrintPreview_SetZoom(PyObject *self, PyObject *args, Py return _resultobj; } -static void *SwigwxPreviewFrameTowxFrame(void *ptr) { - wxPreviewFrame *src; - wxFrame *dest; - src = (wxPreviewFrame *) ptr; - dest = (wxFrame *) src; +static void *SwigwxPyPreviewControlBarTowxPreviewControlBar(void *ptr) { + wxPyPreviewControlBar *src; + wxPreviewControlBar *dest; + src = (wxPyPreviewControlBar *) ptr; + dest = (wxPreviewControlBar *) src; return (void *) dest; } -static void *SwigwxPreviewFrameTowxTopLevelWindow(void *ptr) { - wxPreviewFrame *src; - wxTopLevelWindow *dest; - src = (wxPreviewFrame *) ptr; - dest = (wxTopLevelWindow *) src; +static void *SwigwxPyPreviewControlBarTowxPanel(void *ptr) { + wxPyPreviewControlBar *src; + wxPanel *dest; + src = (wxPyPreviewControlBar *) ptr; + dest = (wxPanel *) src; return (void *) dest; } -static void *SwigwxPreviewFrameTowxWindow(void *ptr) { - wxPreviewFrame *src; +static void *SwigwxPyPreviewControlBarTowxWindow(void *ptr) { + wxPyPreviewControlBar *src; wxWindow *dest; - src = (wxPreviewFrame *) ptr; + src = (wxPyPreviewControlBar *) ptr; dest = (wxWindow *) src; return (void *) dest; } -static void *SwigwxPreviewFrameTowxEvtHandler(void *ptr) { - wxPreviewFrame *src; +static void *SwigwxPyPreviewControlBarTowxEvtHandler(void *ptr) { + wxPyPreviewControlBar *src; wxEvtHandler *dest; - src = (wxPreviewFrame *) ptr; + src = (wxPyPreviewControlBar *) ptr; dest = (wxEvtHandler *) src; return (void *) dest; } -static void *SwigwxPreviewFrameTowxObject(void *ptr) { - wxPreviewFrame *src; +static void *SwigwxPyPreviewControlBarTowxObject(void *ptr) { + wxPyPreviewControlBar *src; wxObject *dest; - src = (wxPreviewFrame *) ptr; + src = (wxPyPreviewControlBar *) ptr; dest = (wxObject *) src; return (void *) dest; } -#define new_wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) -static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxPyPreviewControlBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPyPreviewControlBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) +static PyObject *_wrap_new_wxPyPreviewControlBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPreviewFrame * _result; + wxPyPreviewControlBar * _result; wxPrintPreview * _arg0; - wxFrame * _arg1; - wxString * _arg2; + long _arg1; + wxWindow * _arg2; wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) wxDEFAULT_FRAME_STYLE; - wxString * _arg6 = (wxString *) &wxPyFrameNameStr; + long _arg5 = (long ) 0; + wxString * _arg6 = (wxString *) &wxPyPanelNameStr; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _obj2 = 0; + PyObject * _argo2 = 0; wxPoint temp; PyObject * _obj3 = 0; wxSize temp0; PyObject * _obj4 = 0; PyObject * _obj6 = 0; - char *_kwnames[] = { "preview","parent","title","pos","size","style","name", NULL }; + char *_kwnames[] = { "preview","buttons","parent","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|OOlO:new_wxPreviewFrame",_kwnames,&_argo0,&_argo1,&_obj2,&_obj3,&_obj4,&_arg5,&_obj6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO|OOlO:new_wxPyPreviewControlBar",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintPreview_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPreviewFrame. Expected _wxPrintPreview_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPyPreviewControlBar. Expected _wxPrintPreview_p."); return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPreviewFrame. Expected _wxFrame_p."); + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPyPreviewControlBar. Expected _wxWindow_p."); return NULL; } } -{ - _arg2 = wxString_in_helper(_obj2); - if (_arg2 == NULL) - return NULL; -} if (_obj3) { _arg3 = &temp; @@ -5409,21 +7509,17 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObje } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPreviewFrame *)new_wxPreviewFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6); + _result = (wxPyPreviewControlBar *)new_wxPyPreviewControlBar(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPreviewFrame_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPreviewControlBar_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); _resultobj = Py_None; } -{ - if (_obj2) - delete _arg2; -} { if (_obj6) delete _arg6; @@ -5431,26 +7527,130 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxPreviewFrame_Initialize(_swigobj) (_swigobj->Initialize()) -static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyPreviewControlBar__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyPreviewControlBar__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPreviewFrame * _arg0; + wxPyPreviewControlBar * _arg0; + PyObject * _arg1; + PyObject * _arg2; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","self","_class", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyPreviewControlBar__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewControlBar__setCallbackInfo. Expected _wxPyPreviewControlBar_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + _arg2 = _obj2; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPyPreviewControlBar__setCallbackInfo(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyPreviewControlBar_SetPrintPreview(_swigobj,_swigarg0) (_swigobj->SetPrintPreview(_swigarg0)) +static PyObject *_wrap_wxPyPreviewControlBar_SetPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPreviewControlBar * _arg0; + wxPrintPreview * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","preview", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyPreviewControlBar_SetPrintPreview",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewControlBar_SetPrintPreview. Expected _wxPyPreviewControlBar_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintPreview_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPreviewControlBar_SetPrintPreview. Expected _wxPrintPreview_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPyPreviewControlBar_SetPrintPreview(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyPreviewControlBar_base_CreateButtons(_swigobj) (_swigobj->base_CreateButtons()) +static PyObject *_wrap_wxPyPreviewControlBar_base_CreateButtons(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPreviewControlBar * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewFrame_Initialize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyPreviewControlBar_base_CreateButtons",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPreviewFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPreviewFrame_Initialize. Expected _wxPreviewFrame_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewControlBar_base_CreateButtons. Expected _wxPyPreviewControlBar_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPreviewFrame_Initialize(_arg0); + wxPyPreviewControlBar_base_CreateButtons(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyPreviewControlBar_base_SetZoomControl(_swigobj,_swigarg0) (_swigobj->base_SetZoomControl(_swigarg0)) +static PyObject *_wrap_wxPyPreviewControlBar_base_SetZoomControl(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyPreviewControlBar * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","zoom", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyPreviewControlBar_base_SetZoomControl",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPreviewControlBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPreviewControlBar_base_SetZoomControl. Expected _wxPyPreviewControlBar_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPyPreviewControlBar_base_SetZoomControl(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -5460,25 +7660,68 @@ static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args, } static PyMethodDef printfwcMethods[] = { + { "wxPyPreviewControlBar_base_SetZoomControl", (PyCFunction) _wrap_wxPyPreviewControlBar_base_SetZoomControl, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewControlBar_base_CreateButtons", (PyCFunction) _wrap_wxPyPreviewControlBar_base_CreateButtons, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewControlBar_SetPrintPreview", (PyCFunction) _wrap_wxPyPreviewControlBar_SetPrintPreview, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewControlBar__setCallbackInfo", (PyCFunction) _wrap_wxPyPreviewControlBar__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPyPreviewControlBar", (PyCFunction) _wrap_new_wxPyPreviewControlBar, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewFrame_base_CreateControlBar", (PyCFunction) _wrap_wxPyPreviewFrame_base_CreateControlBar, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewFrame_base_CreateCanvas", (PyCFunction) _wrap_wxPyPreviewFrame_base_CreateCanvas, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewFrame_base_Initialize", (PyCFunction) _wrap_wxPyPreviewFrame_base_Initialize, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewFrame_SetControlBar", (PyCFunction) _wrap_wxPyPreviewFrame_SetControlBar, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewFrame_SetPreviewCanvas", (PyCFunction) _wrap_wxPyPreviewFrame_SetPreviewCanvas, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPreviewFrame__setCallbackInfo", (PyCFunction) _wrap_wxPyPreviewFrame__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPyPreviewFrame", (PyCFunction) _wrap_new_wxPyPreviewFrame, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview_base_DetermineScaling", (PyCFunction) _wrap_wxPyPrintPreview_base_DetermineScaling, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview_base_Print", (PyCFunction) _wrap_wxPyPrintPreview_base_Print, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview_base_SetZoom", (PyCFunction) _wrap_wxPyPrintPreview_base_SetZoom, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview_base_RenderPage", (PyCFunction) _wrap_wxPyPrintPreview_base_RenderPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview_base_DrawBlankPage", (PyCFunction) _wrap_wxPyPrintPreview_base_DrawBlankPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview_base_PaintPage", (PyCFunction) _wrap_wxPyPrintPreview_base_PaintPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview_base_SetCurrentPage", (PyCFunction) _wrap_wxPyPrintPreview_base_SetCurrentPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPyPrintPreview__setCallbackInfo", (PyCFunction) _wrap_wxPyPrintPreview__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPyPrintPreview", (PyCFunction) _wrap_new_wxPyPrintPreview, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_OnGoto", (PyCFunction) _wrap_wxPreviewControlBar_OnGoto, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_OnLast", (PyCFunction) _wrap_wxPreviewControlBar_OnLast, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_OnFirst", (PyCFunction) _wrap_wxPreviewControlBar_OnFirst, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_OnPrevious", (PyCFunction) _wrap_wxPreviewControlBar_OnPrevious, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_OnNext", (PyCFunction) _wrap_wxPreviewControlBar_OnNext, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_GetPrintPreview", (PyCFunction) _wrap_wxPreviewControlBar_GetPrintPreview, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_SetZoomControl", (PyCFunction) _wrap_wxPreviewControlBar_SetZoomControl, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewControlBar_GetZoomControl", (PyCFunction) _wrap_wxPreviewControlBar_GetZoomControl, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPreviewControlBar", (PyCFunction) _wrap_new_wxPreviewControlBar, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPreviewCanvas", (PyCFunction) _wrap_new_wxPreviewCanvas, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewFrame_GetControlBar", (PyCFunction) _wrap_wxPreviewFrame_GetControlBar, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewFrame_CreateCanvas", (PyCFunction) _wrap_wxPreviewFrame_CreateCanvas, METH_VARARGS | METH_KEYWORDS }, + { "wxPreviewFrame_CreateControlBar", (PyCFunction) _wrap_wxPreviewFrame_CreateControlBar, METH_VARARGS | METH_KEYWORDS }, { "wxPreviewFrame_Initialize", (PyCFunction) _wrap_wxPreviewFrame_Initialize, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreviewFrame", (PyCFunction) _wrap_new_wxPreviewFrame, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_SetZoom", (PyCFunction) _wrap_wxPrintPreview_SetZoom, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_SetPrintout", (PyCFunction) _wrap_wxPrintPreview_SetPrintout, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_SetFrame", (PyCFunction) _wrap_wxPrintPreview_SetFrame, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_SetCurrentPage", (PyCFunction) _wrap_wxPrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_SetCanvas", (PyCFunction) _wrap_wxPrintPreview_SetCanvas, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_DetermineScaling", (PyCFunction) _wrap_wxPrintPreview_DetermineScaling, METH_VARARGS | METH_KEYWORDS }, { "wxPrintPreview_Print", (PyCFunction) _wrap_wxPrintPreview_Print, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_SetOk", (PyCFunction) _wrap_wxPrintPreview_SetOk, METH_VARARGS | METH_KEYWORDS }, { "wxPrintPreview_Ok", (PyCFunction) _wrap_wxPrintPreview_Ok, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_GetZoom", (PyCFunction) _wrap_wxPrintPreview_GetZoom, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_GetPrintoutForPrinting", (PyCFunction) _wrap_wxPrintPreview_GetPrintoutForPrinting, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_GetPrintout", (PyCFunction) _wrap_wxPrintPreview_GetPrintout, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_GetPrintDialogData", (PyCFunction) _wrap_wxPrintPreview_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS }, { "wxPrintPreview_GetMinPage", (PyCFunction) _wrap_wxPrintPreview_GetMinPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintPreview_GetMaxPage", (PyCFunction) _wrap_wxPrintPreview_GetMaxPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_GetZoom", (PyCFunction) _wrap_wxPrintPreview_GetZoom, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_SetZoom", (PyCFunction) _wrap_wxPrintPreview_SetZoom, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_GetPrintDialogData", (PyCFunction) _wrap_wxPrintPreview_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_AdjustScrollbars", (PyCFunction) _wrap_wxPrintPreview_AdjustScrollbars, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_RenderPage", (PyCFunction) _wrap_wxPrintPreview_RenderPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_DrawBlankPage", (PyCFunction) _wrap_wxPrintPreview_DrawBlankPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_PaintPage", (PyCFunction) _wrap_wxPrintPreview_PaintPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_GetCanvas", (PyCFunction) _wrap_wxPrintPreview_GetCanvas, METH_VARARGS | METH_KEYWORDS }, { "wxPrintPreview_GetFrame", (PyCFunction) _wrap_wxPrintPreview_GetFrame, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_SetCanvas", (PyCFunction) _wrap_wxPrintPreview_SetCanvas, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_SetFrame", (PyCFunction) _wrap_wxPrintPreview_SetFrame, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_GetPrintoutForPrinting", (PyCFunction) _wrap_wxPrintPreview_GetPrintoutForPrinting, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_GetPrintout", (PyCFunction) _wrap_wxPrintPreview_GetPrintout, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_SetPrintout", (PyCFunction) _wrap_wxPrintPreview_SetPrintout, METH_VARARGS | METH_KEYWORDS }, { "wxPrintPreview_GetCurrentPage", (PyCFunction) _wrap_wxPrintPreview_GetCurrentPage, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintPreview_GetCanvas", (PyCFunction) _wrap_wxPrintPreview_GetCanvas, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintPreview_SetCurrentPage", (PyCFunction) _wrap_wxPrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS }, { "new_wxPrintPreview", (PyCFunction) _wrap_new_wxPrintPreview, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPrintAbortDialog", (PyCFunction) _wrap_new_wxPrintAbortDialog, METH_VARARGS | METH_KEYWORDS }, + { "wxPrinter_GetLastError", (PyCFunction) _wrap_wxPrinter_GetLastError, METH_VARARGS | METH_KEYWORDS }, + { "wxPrinter_GetAbort", (PyCFunction) _wrap_wxPrinter_GetAbort, METH_VARARGS | METH_KEYWORDS }, { "wxPrinter_Setup", (PyCFunction) _wrap_wxPrinter_Setup, METH_VARARGS | METH_KEYWORDS }, { "wxPrinter_ReportError", (PyCFunction) _wrap_wxPrinter_ReportError, METH_VARARGS | METH_KEYWORDS }, { "wxPrinter_PrintDialog", (PyCFunction) _wrap_wxPrinter_PrintDialog, METH_VARARGS | METH_KEYWORDS }, @@ -5507,29 +7750,37 @@ static PyMethodDef printfwcMethods[] = { { "wxPrintDialog_GetPrintDC", (PyCFunction) _wrap_wxPrintDialog_GetPrintDC, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialog_GetPrintDialogData", (PyCFunction) _wrap_wxPrintDialog_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS }, { "new_wxPrintDialog", (PyCFunction) _wrap_new_wxPrintDialog, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_SetToPage", (PyCFunction) _wrap_wxPrintDialogData_SetToPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetPrintData", (PyCFunction) _wrap_wxPrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetPrintData", (PyCFunction) _wrap_wxPrintDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_Ok", (PyCFunction) _wrap_wxPrintDialogData_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetEnableHelp", (PyCFunction) _wrap_wxPrintDialogData_GetEnableHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetEnablePageNumbers", (PyCFunction) _wrap_wxPrintDialogData_GetEnablePageNumbers, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetEnableSelection", (PyCFunction) _wrap_wxPrintDialogData_GetEnableSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetEnablePrintToFile", (PyCFunction) _wrap_wxPrintDialogData_GetEnablePrintToFile, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_EnableHelp", (PyCFunction) _wrap_wxPrintDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_EnablePageNumbers", (PyCFunction) _wrap_wxPrintDialogData_EnablePageNumbers, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_EnableSelection", (PyCFunction) _wrap_wxPrintDialogData_EnableSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_EnablePrintToFile", (PyCFunction) _wrap_wxPrintDialogData_EnablePrintToFile, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetSetupDialog", (PyCFunction) _wrap_wxPrintDialogData_SetSetupDialog, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetPrintToFile", (PyCFunction) _wrap_wxPrintDialogData_SetPrintToFile, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_SetPrintData", (PyCFunction) _wrap_wxPrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetCollate", (PyCFunction) _wrap_wxPrintDialogData_SetCollate, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetSelection", (PyCFunction) _wrap_wxPrintDialogData_SetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetAllPages", (PyCFunction) _wrap_wxPrintDialogData_SetAllPages, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetNoCopies", (PyCFunction) _wrap_wxPrintDialogData_SetNoCopies, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_SetMinPage", (PyCFunction) _wrap_wxPrintDialogData_SetMinPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetMaxPage", (PyCFunction) _wrap_wxPrintDialogData_SetMaxPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetMinPage", (PyCFunction) _wrap_wxPrintDialogData_SetMinPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_SetToPage", (PyCFunction) _wrap_wxPrintDialogData_SetToPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_SetFromPage", (PyCFunction) _wrap_wxPrintDialogData_SetFromPage, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_SetCollate", (PyCFunction) _wrap_wxPrintDialogData_SetCollate, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_Ok", (PyCFunction) _wrap_wxPrintDialogData_Ok, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_GetToPage", (PyCFunction) _wrap_wxPrintDialogData_GetToPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetSetupDialog", (PyCFunction) _wrap_wxPrintDialogData_GetSetupDialog, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetPrintToFile", (PyCFunction) _wrap_wxPrintDialogData_GetPrintToFile, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_GetPrintData", (PyCFunction) _wrap_wxPrintDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetCollate", (PyCFunction) _wrap_wxPrintDialogData_GetCollate, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetSelection", (PyCFunction) _wrap_wxPrintDialogData_GetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetAllPages", (PyCFunction) _wrap_wxPrintDialogData_GetAllPages, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetNoCopies", (PyCFunction) _wrap_wxPrintDialogData_GetNoCopies, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_GetMinPage", (PyCFunction) _wrap_wxPrintDialogData_GetMinPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetMaxPage", (PyCFunction) _wrap_wxPrintDialogData_GetMaxPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetMinPage", (PyCFunction) _wrap_wxPrintDialogData_GetMinPage, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintDialogData_GetToPage", (PyCFunction) _wrap_wxPrintDialogData_GetToPage, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialogData_GetFromPage", (PyCFunction) _wrap_wxPrintDialogData_GetFromPage, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_GetCollate", (PyCFunction) _wrap_wxPrintDialogData_GetCollate, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_GetAllPages", (PyCFunction) _wrap_wxPrintDialogData_GetAllPages, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_EnableSelection", (PyCFunction) _wrap_wxPrintDialogData_EnableSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_EnablePrintToFile", (PyCFunction) _wrap_wxPrintDialogData_EnablePrintToFile, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_EnablePageNumbers", (PyCFunction) _wrap_wxPrintDialogData_EnablePageNumbers, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintDialogData_EnableHelp", (PyCFunction) _wrap_wxPrintDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS }, { "delete_wxPrintDialogData", (PyCFunction) _wrap_delete_wxPrintDialogData, METH_VARARGS | METH_KEYWORDS }, { "new_wxPrintDialogData", (PyCFunction) _wrap_new_wxPrintDialogData, METH_VARARGS | METH_KEYWORDS }, { "wxPageSetupDialog_ShowModal", (PyCFunction) _wrap_wxPageSetupDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, @@ -5640,6 +7891,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_long","_signed_long",0}, { "_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC}, { "_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC}, + { "_wxPrintPreview","_wxPyPrintPreview",SwigwxPyPrintPreviewTowxPrintPreview}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -5647,7 +7899,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_wxPanel","_wxPyPreviewControlBar",SwigwxPyPreviewControlBarTowxPanel}, + { "_wxPanel","_wxPreviewControlBar",SwigwxPreviewControlBarTowxPanel}, + { "_wxPanel","_wxPreviewCanvas",SwigwxPreviewCanvasTowxPanel}, + { "_wxTopLevelWindow","_wxPyPreviewFrame",SwigwxPyPreviewFrameTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPrintAbortDialog",SwigwxPrintAbortDialogTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow}, { "_uint","_wxCoord",0}, @@ -5665,6 +7922,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, + { "_wxPreviewControlBar","_wxPyPreviewControlBar",SwigwxPyPreviewControlBarTowxPreviewControlBar}, { "_unsigned_long","_long",0}, { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, @@ -5677,8 +7935,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_wxObject","_wxPyPreviewControlBar",SwigwxPyPreviewControlBarTowxObject}, + { "_wxObject","_wxPyPreviewFrame",SwigwxPyPreviewFrameTowxObject}, + { "_wxObject","_wxPyPrintPreview",SwigwxPyPrintPreviewTowxObject}, + { "_wxObject","_wxPreviewControlBar",SwigwxPreviewControlBarTowxObject}, + { "_wxObject","_wxPreviewCanvas",SwigwxPreviewCanvasTowxObject}, { "_wxObject","_wxPreviewFrame",SwigwxPreviewFrameTowxObject}, { "_wxObject","_wxPrintPreview",SwigwxPrintPreviewTowxObject}, + { "_wxObject","_wxPrintAbortDialog",SwigwxPrintAbortDialogTowxObject}, { "_wxObject","_wxPrinter",SwigwxPrinterTowxObject}, { "_wxObject","_wxPyPrintout",SwigwxPyPrintoutTowxObject}, { "_wxObject","_wxPrintDialog",SwigwxPrintDialogTowxObject}, @@ -5690,6 +7954,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxObject","_wxPrintData",SwigwxPrintDataTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, + { "_wxScrolledWindow","_wxPreviewCanvas",SwigwxPreviewCanvasTowxScrolledWindow}, { "_unsigned_char","_byte",0}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, @@ -5698,11 +7963,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_int","_uint",0}, { "_unsigned_int","_wxWindowID",0}, { "_unsigned_int","_int",0}, + { "_wxDialog","_wxPrintAbortDialog",SwigwxPrintAbortDialogTowxDialog}, { "_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog}, { "_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog}, { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, + { "_wxFrame","_wxPyPreviewFrame",SwigwxPyPreviewFrameTowxFrame}, { "_wxFrame","_wxPreviewFrame",SwigwxPreviewFrameTowxFrame}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, @@ -5738,10 +8005,21 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, + { "_wxPreviewFrame","_wxPyPreviewFrame",SwigwxPyPreviewFrameTowxPreviewFrame}, + { "_wxEvtHandler","_wxPyPreviewControlBar",SwigwxPyPreviewControlBarTowxEvtHandler}, + { "_wxEvtHandler","_wxPyPreviewFrame",SwigwxPyPreviewFrameTowxEvtHandler}, + { "_wxEvtHandler","_wxPreviewControlBar",SwigwxPreviewControlBarTowxEvtHandler}, + { "_wxEvtHandler","_wxPreviewCanvas",SwigwxPreviewCanvasTowxEvtHandler}, { "_wxEvtHandler","_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler}, + { "_wxEvtHandler","_wxPrintAbortDialog",SwigwxPrintAbortDialogTowxEvtHandler}, { "_wxEvtHandler","_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler}, { "_wxEvtHandler","_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler}, + { "_wxWindow","_wxPyPreviewControlBar",SwigwxPyPreviewControlBarTowxWindow}, + { "_wxWindow","_wxPyPreviewFrame",SwigwxPyPreviewFrameTowxWindow}, + { "_wxWindow","_wxPreviewControlBar",SwigwxPreviewControlBarTowxWindow}, + { "_wxWindow","_wxPreviewCanvas",SwigwxPreviewCanvasTowxWindow}, { "_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow}, + { "_wxWindow","_wxPrintAbortDialog",SwigwxPrintAbortDialogTowxWindow}, { "_wxWindow","_wxPrintDialog",SwigwxPrintDialogTowxWindow}, { "_wxWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow}, {0,0,0}}; @@ -5755,6 +8033,29 @@ SWIGEXPORT(void) initprintfwc() { SWIG_globals = SWIG_newvarlink(); m = Py_InitModule("printfwc", printfwcMethods); d = PyModule_GetDict(m); + PyDict_SetItemString(d,"wxPRINT_MODE_NONE", PyInt_FromLong((long) wxPRINT_MODE_NONE)); + PyDict_SetItemString(d,"wxPRINT_MODE_PREVIEW", PyInt_FromLong((long) wxPRINT_MODE_PREVIEW)); + PyDict_SetItemString(d,"wxPRINT_MODE_FILE", PyInt_FromLong((long) wxPRINT_MODE_FILE)); + PyDict_SetItemString(d,"wxPRINT_MODE_PRINTER", PyInt_FromLong((long) wxPRINT_MODE_PRINTER)); + PyDict_SetItemString(d,"wxPRINTER_NO_ERROR", PyInt_FromLong((long) wxPRINTER_NO_ERROR)); + PyDict_SetItemString(d,"wxPRINTER_CANCELLED", PyInt_FromLong((long) wxPRINTER_CANCELLED)); + PyDict_SetItemString(d,"wxPRINTER_ERROR", PyInt_FromLong((long) wxPRINTER_ERROR)); + PyDict_SetItemString(d,"wxPREVIEW_PRINT", PyInt_FromLong((long) wxPREVIEW_PRINT)); + PyDict_SetItemString(d,"wxPREVIEW_PREVIOUS", PyInt_FromLong((long) wxPREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"wxPREVIEW_NEXT", PyInt_FromLong((long) wxPREVIEW_NEXT)); + PyDict_SetItemString(d,"wxPREVIEW_ZOOM", PyInt_FromLong((long) wxPREVIEW_ZOOM)); + PyDict_SetItemString(d,"wxPREVIEW_FIRST", PyInt_FromLong((long) wxPREVIEW_FIRST)); + PyDict_SetItemString(d,"wxPREVIEW_LAST", PyInt_FromLong((long) wxPREVIEW_LAST)); + PyDict_SetItemString(d,"wxPREVIEW_GOTO", PyInt_FromLong((long) wxPREVIEW_GOTO)); + PyDict_SetItemString(d,"wxPREVIEW_DEFAULT", PyInt_FromLong((long) wxPREVIEW_DEFAULT)); + PyDict_SetItemString(d,"wxID_PREVIEW_CLOSE", PyInt_FromLong((long) wxID_PREVIEW_CLOSE)); + PyDict_SetItemString(d,"wxID_PREVIEW_NEXT", PyInt_FromLong((long) wxID_PREVIEW_NEXT)); + PyDict_SetItemString(d,"wxID_PREVIEW_PREVIOUS", PyInt_FromLong((long) wxID_PREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"wxID_PREVIEW_PRINT", PyInt_FromLong((long) wxID_PREVIEW_PRINT)); + PyDict_SetItemString(d,"wxID_PREVIEW_ZOOM", PyInt_FromLong((long) wxID_PREVIEW_ZOOM)); + PyDict_SetItemString(d,"wxID_PREVIEW_FIRST", PyInt_FromLong((long) wxID_PREVIEW_FIRST)); + PyDict_SetItemString(d,"wxID_PREVIEW_LAST", PyInt_FromLong((long) wxID_PREVIEW_LAST)); + PyDict_SetItemString(d,"wxID_PREVIEW_GOTO", PyInt_FromLong((long) wxID_PREVIEW_GOTO)); wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout"); { diff --git a/wxPython/src/msw/printfw.py b/wxPython/src/msw/printfw.py index ba11c95428..dff9896cf4 100644 --- a/wxPython/src/msw/printfw.py +++ b/wxPython/src/msw/printfw.py @@ -32,134 +32,135 @@ class wxPrintDataPtr(wxObjectPtr): except: pass def GetNoCopies(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetNoCopies(self, *_args, **_kwargs) return val def GetCollate(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetCollate,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetCollate(self, *_args, **_kwargs) return val def GetOrientation(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetOrientation,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetOrientation(self, *_args, **_kwargs) return val def Ok(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_Ok,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_Ok(self, *_args, **_kwargs) return val def GetPrinterName(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrinterName,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrinterName(self, *_args, **_kwargs) return val def GetColour(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetColour,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetColour(self, *_args, **_kwargs) return val def GetDuplex(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetDuplex,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetDuplex(self, *_args, **_kwargs) return val def GetPaperId(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPaperId,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPaperId(self, *_args, **_kwargs) return val def GetPaperSize(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPaperSize,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPaperSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) return val def GetQuality(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetQuality,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetQuality(self, *_args, **_kwargs) return val def SetNoCopies(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetNoCopies,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetNoCopies(self, *_args, **_kwargs) return val def SetCollate(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetCollate,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetCollate(self, *_args, **_kwargs) return val def SetOrientation(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetOrientation,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetOrientation(self, *_args, **_kwargs) return val def SetPrinterName(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterName,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterName(self, *_args, **_kwargs) return val def SetColour(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetColour,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetColour(self, *_args, **_kwargs) return val def SetDuplex(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetDuplex,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetDuplex(self, *_args, **_kwargs) return val def SetPaperId(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPaperId,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPaperId(self, *_args, **_kwargs) return val def SetPaperSize(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPaperSize,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPaperSize(self, *_args, **_kwargs) return val def SetQuality(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetQuality,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetQuality(self, *_args, **_kwargs) return val def GetPrinterCommand(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrinterCommand,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrinterCommand(self, *_args, **_kwargs) return val def GetPrinterOptions(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrinterOptions,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrinterOptions(self, *_args, **_kwargs) return val def GetPreviewCommand(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPreviewCommand,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPreviewCommand(self, *_args, **_kwargs) return val def GetFilename(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetFilename,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetFilename(self, *_args, **_kwargs) return val def GetFontMetricPath(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetFontMetricPath,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetFontMetricPath(self, *_args, **_kwargs) return val def GetPrinterScaleX(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrinterScaleX,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrinterScaleX(self, *_args, **_kwargs) return val def GetPrinterScaleY(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrinterScaleY,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrinterScaleY(self, *_args, **_kwargs) return val def GetPrinterTranslateX(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrinterTranslateX,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrinterTranslateX(self, *_args, **_kwargs) return val def GetPrinterTranslateY(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrinterTranslateY,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrinterTranslateY(self, *_args, **_kwargs) return val def GetPrintMode(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_GetPrintMode,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_GetPrintMode(self, *_args, **_kwargs) return val def SetPrinterCommand(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterCommand,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterCommand(self, *_args, **_kwargs) return val def SetPrinterOptions(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterOptions,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterOptions(self, *_args, **_kwargs) return val def SetPreviewCommand(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPreviewCommand,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPreviewCommand(self, *_args, **_kwargs) return val def SetFilename(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetFilename,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetFilename(self, *_args, **_kwargs) return val def SetFontMetricPath(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetFontMetricPath,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetFontMetricPath(self, *_args, **_kwargs) return val def SetPrinterScaleX(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterScaleX,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterScaleX(self, *_args, **_kwargs) return val def SetPrinterScaleY(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterScaleY,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterScaleY(self, *_args, **_kwargs) return val def SetPrinterScaling(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterScaling,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterScaling(self, *_args, **_kwargs) return val def SetPrinterTranslateX(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterTranslateX,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterTranslateX(self, *_args, **_kwargs) return val def SetPrinterTranslateY(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterTranslateY,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterTranslateY(self, *_args, **_kwargs) return val def SetPrinterTranslation(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrinterTranslation,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrinterTranslation(self, *_args, **_kwargs) return val def SetPrintMode(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintData_SetPrintMode,(self,) + _args, _kwargs) + val = printfwc.wxPrintData_SetPrintMode(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxPrintData(wxPrintDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPrintData,_args,_kwargs) + self.this = printfwc.new_wxPrintData(*_args,**_kwargs) self.thisown = 1 @@ -170,16 +171,16 @@ class wxPrinterDCPtr(wxDCPtr): self.this = this self.thisown = 0 def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPrinterDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPrinterDC(wxPrinterDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPrinterDC,_args,_kwargs) + self.this = printfwc.new_wxPrinterDC(*_args,**_kwargs) self.thisown = 1 def wxPrinterDC2(*_args,**_kwargs): - val = wxPrinterDCPtr(apply(printfwc.new_wxPrinterDC2,_args,_kwargs)) + val = wxPrinterDCPtr(printfwc.new_wxPrinterDC2(*_args,**_kwargs)) val.thisown = 1 return val @@ -189,17 +190,17 @@ class wxPostScriptDCPtr(wxDCPtr): self.this = this self.thisown = 0 def GetPrintData(self, *_args, **_kwargs): - val = apply(printfwc.wxPostScriptDC_GetPrintData,(self,) + _args, _kwargs) + val = printfwc.wxPostScriptDC_GetPrintData(self, *_args, **_kwargs) if val: val = wxPrintDataPtr(val) return val def SetPrintData(self, *_args, **_kwargs): - val = apply(printfwc.wxPostScriptDC_SetPrintData,(self,) + _args, _kwargs) + val = printfwc.wxPostScriptDC_SetPrintData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPostScriptDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPostScriptDC(wxPostScriptDCPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPostScriptDC,_args,_kwargs) + self.this = printfwc.new_wxPostScriptDC(*_args,**_kwargs) self.thisown = 1 @@ -216,103 +217,104 @@ class wxPageSetupDialogDataPtr(wxObjectPtr): except: pass def EnableHelp(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_EnableHelp(self, *_args, **_kwargs) return val def EnableMargins(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_EnableMargins,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_EnableMargins(self, *_args, **_kwargs) return val def EnableOrientation(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_EnableOrientation,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_EnableOrientation(self, *_args, **_kwargs) return val def EnablePaper(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_EnablePaper,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_EnablePaper(self, *_args, **_kwargs) return val def EnablePrinter(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_EnablePrinter,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_EnablePrinter(self, *_args, **_kwargs) return val def GetDefaultMinMargins(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetDefaultMinMargins,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetDefaultMinMargins(self, *_args, **_kwargs) return val def GetEnableMargins(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetEnableMargins,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetEnableMargins(self, *_args, **_kwargs) return val def GetEnableOrientation(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetEnableOrientation,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetEnableOrientation(self, *_args, **_kwargs) return val def GetEnablePaper(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetEnablePaper,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetEnablePaper(self, *_args, **_kwargs) return val def GetEnablePrinter(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetEnablePrinter,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetEnablePrinter(self, *_args, **_kwargs) return val def GetEnableHelp(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetEnableHelp,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetEnableHelp(self, *_args, **_kwargs) return val def GetDefaultInfo(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetDefaultInfo,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetDefaultInfo(self, *_args, **_kwargs) return val def GetMarginTopLeft(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetMarginTopLeft,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetMarginTopLeft(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetMarginBottomRight(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetMarginBottomRight,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetMarginBottomRight(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetMinMarginTopLeft(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetMinMarginTopLeft,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetMinMarginTopLeft(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetMinMarginBottomRight(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetMinMarginBottomRight,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetMinMarginBottomRight(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetPaperId(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetPaperId,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetPaperId(self, *_args, **_kwargs) return val def GetPaperSize(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetPaperSize,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetPaperSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetPrintData(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_GetPrintData,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_GetPrintData(self, *_args, **_kwargs) if val: val = wxPrintDataPtr(val) ; val.thisown = 1 return val def Ok(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_Ok,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_Ok(self, *_args, **_kwargs) return val def SetDefaultInfo(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetDefaultInfo,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetDefaultInfo(self, *_args, **_kwargs) return val def SetDefaultMinMargins(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetDefaultMinMargins,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetDefaultMinMargins(self, *_args, **_kwargs) return val def SetMarginTopLeft(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetMarginTopLeft,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetMarginTopLeft(self, *_args, **_kwargs) return val def SetMarginBottomRight(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetMarginBottomRight,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetMarginBottomRight(self, *_args, **_kwargs) return val def SetMinMarginTopLeft(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetMinMarginTopLeft,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetMinMarginTopLeft(self, *_args, **_kwargs) return val def SetMinMarginBottomRight(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetMinMarginBottomRight,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetMinMarginBottomRight(self, *_args, **_kwargs) return val def SetPaperId(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetPaperId,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetPaperId(self, *_args, **_kwargs) return val def SetPaperSize(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetPaperSize,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetPaperSize(self, *_args, **_kwargs) return val def SetPrintData(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialogData_SetPrintData,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialogData_SetPrintData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxPageSetupDialogData(wxPageSetupDialogDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPageSetupDialogData,_args,_kwargs) + self.this = printfwc.new_wxPageSetupDialogData(*_args,**_kwargs) self.thisown = 1 @@ -323,17 +325,17 @@ class wxPageSetupDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def GetPageSetupData(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialog_GetPageSetupData,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialog_GetPageSetupData(self, *_args, **_kwargs) if val: val = wxPageSetupDialogDataPtr(val) return val def ShowModal(self, *_args, **_kwargs): - val = apply(printfwc.wxPageSetupDialog_ShowModal,(self,) + _args, _kwargs) + val = printfwc.wxPageSetupDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPageSetupDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPageSetupDialog(wxPageSetupDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPageSetupDialog,_args,_kwargs) + self.this = printfwc.new_wxPageSetupDialog(*_args,**_kwargs) self.thisown = 1 #wx._StdDialogCallbacks(self) @@ -350,81 +352,106 @@ class wxPrintDialogDataPtr(wxObjectPtr): delfunc(self) except: pass - def EnableHelp(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs) + def GetFromPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetFromPage(self, *_args, **_kwargs) return val - def EnablePageNumbers(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_EnablePageNumbers,(self,) + _args, _kwargs) + def GetToPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetToPage(self, *_args, **_kwargs) return val - def EnablePrintToFile(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_EnablePrintToFile,(self,) + _args, _kwargs) + def GetMinPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetMinPage(self, *_args, **_kwargs) return val - def EnableSelection(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_EnableSelection,(self,) + _args, _kwargs) + def GetMaxPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetMaxPage(self, *_args, **_kwargs) + return val + def GetNoCopies(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetNoCopies(self, *_args, **_kwargs) return val def GetAllPages(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetAllPages,(self,) + _args, _kwargs) + val = printfwc.wxPrintDialogData_GetAllPages(self, *_args, **_kwargs) + return val + def GetSelection(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetSelection(self, *_args, **_kwargs) return val def GetCollate(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetCollate,(self,) + _args, _kwargs) + val = printfwc.wxPrintDialogData_GetCollate(self, *_args, **_kwargs) return val - def GetFromPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetFromPage,(self,) + _args, _kwargs) + def GetPrintToFile(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetPrintToFile(self, *_args, **_kwargs) return val - def GetMaxPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetMaxPage,(self,) + _args, _kwargs) + def GetSetupDialog(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetSetupDialog(self, *_args, **_kwargs) return val - def GetMinPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetMinPage,(self,) + _args, _kwargs) + def SetFromPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetFromPage(self, *_args, **_kwargs) return val - def GetNoCopies(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetNoCopies,(self,) + _args, _kwargs) + def SetToPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetToPage(self, *_args, **_kwargs) return val - def GetPrintData(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetPrintData,(self,) + _args, _kwargs) - if val: val = wxPrintDataPtr(val) ; val.thisown = 1 + def SetMinPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetMinPage(self, *_args, **_kwargs) return val - def GetPrintToFile(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetPrintToFile,(self,) + _args, _kwargs) + def SetMaxPage(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetMaxPage(self, *_args, **_kwargs) return val - def GetToPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_GetToPage,(self,) + _args, _kwargs) + def SetNoCopies(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetNoCopies(self, *_args, **_kwargs) return val - def Ok(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_Ok,(self,) + _args, _kwargs) + def SetAllPages(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetAllPages(self, *_args, **_kwargs) + return val + def SetSelection(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetSelection(self, *_args, **_kwargs) return val def SetCollate(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetCollate,(self,) + _args, _kwargs) + val = printfwc.wxPrintDialogData_SetCollate(self, *_args, **_kwargs) return val - def SetFromPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetFromPage,(self,) + _args, _kwargs) + def SetPrintToFile(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetPrintToFile(self, *_args, **_kwargs) return val - def SetMaxPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetMaxPage,(self,) + _args, _kwargs) + def SetSetupDialog(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetSetupDialog(self, *_args, **_kwargs) return val - def SetMinPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetMinPage,(self,) + _args, _kwargs) + def EnablePrintToFile(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_EnablePrintToFile(self, *_args, **_kwargs) return val - def SetNoCopies(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetNoCopies,(self,) + _args, _kwargs) + def EnableSelection(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_EnableSelection(self, *_args, **_kwargs) return val - def SetPrintData(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetPrintData,(self,) + _args, _kwargs) + def EnablePageNumbers(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_EnablePageNumbers(self, *_args, **_kwargs) return val - def SetPrintToFile(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetPrintToFile,(self,) + _args, _kwargs) + def EnableHelp(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_EnableHelp(self, *_args, **_kwargs) return val - def SetSetupDialog(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetSetupDialog,(self,) + _args, _kwargs) + def GetEnablePrintToFile(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetEnablePrintToFile(self, *_args, **_kwargs) return val - def SetToPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialogData_SetToPage,(self,) + _args, _kwargs) + def GetEnableSelection(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetEnableSelection(self, *_args, **_kwargs) + return val + def GetEnablePageNumbers(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetEnablePageNumbers(self, *_args, **_kwargs) + return val + def GetEnableHelp(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetEnableHelp(self, *_args, **_kwargs) + return val + def Ok(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_Ok(self, *_args, **_kwargs) + return val + def GetPrintData(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_GetPrintData(self, *_args, **_kwargs) + if val: val = wxPrintDataPtr(val) ; val.thisown = 1 + return val + def SetPrintData(self, *_args, **_kwargs): + val = printfwc.wxPrintDialogData_SetPrintData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPrintDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxPrintDialogData(wxPrintDialogDataPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPrintDialogData,_args,_kwargs) + self.this = printfwc.new_wxPrintDialogData(*_args,**_kwargs) self.thisown = 1 @@ -435,20 +462,20 @@ class wxPrintDialogPtr(wxDialogPtr): self.this = this self.thisown = 0 def GetPrintDialogData(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialog_GetPrintDialogData,(self,) + _args, _kwargs) + val = printfwc.wxPrintDialog_GetPrintDialogData(self, *_args, **_kwargs) if val: val = wxPrintDialogDataPtr(val) return val def GetPrintDC(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialog_GetPrintDC,(self,) + _args, _kwargs) + val = printfwc.wxPrintDialog_GetPrintDC(self, *_args, **_kwargs) return val def ShowModal(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintDialog_ShowModal,(self,) + _args, _kwargs) + val = printfwc.wxPrintDialog_ShowModal(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPrintDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPrintDialog(wxPrintDialogPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPrintDialog,_args,_kwargs) + self.this = printfwc.new_wxPrintDialog(*_args,**_kwargs) self.thisown = 1 #wx._StdDialogCallbacks(self) @@ -460,55 +487,55 @@ class wxPrintoutPtr(wxObjectPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout__setCallbackInfo,(self,) + _args, _kwargs) + val = printfwc.wxPrintout__setCallbackInfo(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_Destroy,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_Destroy(self, *_args, **_kwargs) return val def GetDC(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_GetDC,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_GetDC(self, *_args, **_kwargs) return val def GetPageSizeMM(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_GetPageSizeMM,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_GetPageSizeMM(self, *_args, **_kwargs) return val def GetPageSizePixels(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_GetPageSizePixels,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_GetPageSizePixels(self, *_args, **_kwargs) return val def GetPPIPrinter(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_GetPPIPrinter,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_GetPPIPrinter(self, *_args, **_kwargs) return val def GetPPIScreen(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_GetPPIScreen,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_GetPPIScreen(self, *_args, **_kwargs) return val def IsPreview(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_IsPreview,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_IsPreview(self, *_args, **_kwargs) return val def base_OnBeginDocument(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_base_OnBeginDocument,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_base_OnBeginDocument(self, *_args, **_kwargs) return val def base_OnEndDocument(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_base_OnEndDocument,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_base_OnEndDocument(self, *_args, **_kwargs) return val def base_OnBeginPrinting(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_base_OnBeginPrinting,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_base_OnBeginPrinting(self, *_args, **_kwargs) return val def base_OnEndPrinting(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_base_OnEndPrinting,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_base_OnEndPrinting(self, *_args, **_kwargs) return val def base_OnPreparePrinting(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_base_OnPreparePrinting,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_base_OnPreparePrinting(self, *_args, **_kwargs) return val def base_GetPageInfo(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_base_GetPageInfo,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_base_GetPageInfo(self, *_args, **_kwargs) return val def base_HasPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintout_base_HasPage,(self,) + _args, _kwargs) + val = printfwc.wxPrintout_base_HasPage(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPrintout(wxPrintoutPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPrintout,_args,_kwargs) + self.this = printfwc.new_wxPrintout(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPrintout) @@ -526,29 +553,46 @@ class wxPrinterPtr(wxObjectPtr): except: pass def CreateAbortWindow(self, *_args, **_kwargs): - val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs) + val = printfwc.wxPrinter_CreateAbortWindow(self, *_args, **_kwargs) return val def GetPrintDialogData(self, *_args, **_kwargs): - val = apply(printfwc.wxPrinter_GetPrintDialogData,(self,) + _args, _kwargs) + val = printfwc.wxPrinter_GetPrintDialogData(self, *_args, **_kwargs) if val: val = wxPrintDialogDataPtr(val) return val def Print(self, *_args, **_kwargs): - val = apply(printfwc.wxPrinter_Print,(self,) + _args, _kwargs) + val = printfwc.wxPrinter_Print(self, *_args, **_kwargs) return val def PrintDialog(self, *_args, **_kwargs): - val = apply(printfwc.wxPrinter_PrintDialog,(self,) + _args, _kwargs) + val = printfwc.wxPrinter_PrintDialog(self, *_args, **_kwargs) return val def ReportError(self, *_args, **_kwargs): - val = apply(printfwc.wxPrinter_ReportError,(self,) + _args, _kwargs) + val = printfwc.wxPrinter_ReportError(self, *_args, **_kwargs) return val def Setup(self, *_args, **_kwargs): - val = apply(printfwc.wxPrinter_Setup,(self,) + _args, _kwargs) + val = printfwc.wxPrinter_Setup(self, *_args, **_kwargs) + return val + def GetAbort(self, *_args, **_kwargs): + val = printfwc.wxPrinter_GetAbort(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPrinter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPrinter(wxPrinterPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPrinter,_args,_kwargs) + self.this = printfwc.new_wxPrinter(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxPrintAbortDialogPtr(wxDialogPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPrintAbortDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPrintAbortDialog(wxPrintAbortDialogPtr): + def __init__(self,*_args,**_kwargs): + self.this = printfwc.new_wxPrintAbortDialog(*_args,**_kwargs) self.thisown = 1 @@ -558,60 +602,80 @@ class wxPrintPreviewPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 - def GetCanvas(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetCanvas,(self,) + _args, _kwargs) + def SetCurrentPage(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_SetCurrentPage(self, *_args, **_kwargs) return val def GetCurrentPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetCurrentPage,(self,) + _args, _kwargs) + val = printfwc.wxPrintPreview_GetCurrentPage(self, *_args, **_kwargs) + return val + def SetPrintout(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_SetPrintout(self, *_args, **_kwargs) + return val + def GetPrintout(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_GetPrintout(self, *_args, **_kwargs) + return val + def GetPrintoutForPrinting(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_GetPrintoutForPrinting(self, *_args, **_kwargs) + return val + def SetFrame(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_SetFrame(self, *_args, **_kwargs) + return val + def SetCanvas(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_SetCanvas(self, *_args, **_kwargs) return val def GetFrame(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetFrame,(self,) + _args, _kwargs) + val = printfwc.wxPrintPreview_GetFrame(self, *_args, **_kwargs) return val - def GetMaxPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetMaxPage,(self,) + _args, _kwargs) + def GetCanvas(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_GetCanvas(self, *_args, **_kwargs) + if val: val = wxPreviewCanvasPtr(val) return val - def GetMinPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetMinPage,(self,) + _args, _kwargs) + def PaintPage(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_PaintPage(self, *_args, **_kwargs) + return val + def DrawBlankPage(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_DrawBlankPage(self, *_args, **_kwargs) + return val + def RenderPage(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_RenderPage(self, *_args, **_kwargs) + return val + def AdjustScrollbars(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_AdjustScrollbars(self, *_args, **_kwargs) return val def GetPrintDialogData(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetPrintDialogData,(self,) + _args, _kwargs) + val = printfwc.wxPrintPreview_GetPrintDialogData(self, *_args, **_kwargs) if val: val = wxPrintDialogDataPtr(val) return val - def GetPrintout(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetPrintout,(self,) + _args, _kwargs) - return val - def GetPrintoutForPrinting(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetPrintoutForPrinting,(self,) + _args, _kwargs) + def SetZoom(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_SetZoom(self, *_args, **_kwargs) return val def GetZoom(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_GetZoom,(self,) + _args, _kwargs) + val = printfwc.wxPrintPreview_GetZoom(self, *_args, **_kwargs) return val - def Ok(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_Ok,(self,) + _args, _kwargs) + def GetMaxPage(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_GetMaxPage(self, *_args, **_kwargs) return val - def Print(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_Print,(self,) + _args, _kwargs) + def GetMinPage(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_GetMinPage(self, *_args, **_kwargs) return val - def SetCanvas(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_SetCanvas,(self,) + _args, _kwargs) + def Ok(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_Ok(self, *_args, **_kwargs) return val - def SetCurrentPage(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_SetCurrentPage,(self,) + _args, _kwargs) + def SetOk(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_SetOk(self, *_args, **_kwargs) return val - def SetFrame(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_SetFrame,(self,) + _args, _kwargs) - return val - def SetPrintout(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_SetPrintout,(self,) + _args, _kwargs) + def Print(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_Print(self, *_args, **_kwargs) return val - def SetZoom(self, *_args, **_kwargs): - val = apply(printfwc.wxPrintPreview_SetZoom,(self,) + _args, _kwargs) + def DetermineScaling(self, *_args, **_kwargs): + val = printfwc.wxPrintPreview_DetermineScaling(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + def __nonzero__(self): return self.Ok() class wxPrintPreview(wxPrintPreviewPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPrintPreview,_args,_kwargs) + self.this = printfwc.new_wxPrintPreview(*_args,**_kwargs) self.thisown = 1 @@ -622,19 +686,185 @@ class wxPreviewFramePtr(wxFramePtr): self.this = this self.thisown = 0 def Initialize(self, *_args, **_kwargs): - val = apply(printfwc.wxPreviewFrame_Initialize,(self,) + _args, _kwargs) + val = printfwc.wxPreviewFrame_Initialize(self, *_args, **_kwargs) + return val + def CreateControlBar(self, *_args, **_kwargs): + val = printfwc.wxPreviewFrame_CreateControlBar(self, *_args, **_kwargs) + return val + def CreateCanvas(self, *_args, **_kwargs): + val = printfwc.wxPreviewFrame_CreateCanvas(self, *_args, **_kwargs) + return val + def GetControlBar(self, *_args, **_kwargs): + val = printfwc.wxPreviewFrame_GetControlBar(self, *_args, **_kwargs) + if val: val = wxPreviewControlBarPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPreviewFrame(wxPreviewFramePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(printfwc.new_wxPreviewFrame,_args,_kwargs) + self.this = printfwc.new_wxPreviewFrame(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) +class wxPreviewCanvasPtr(wxScrolledWindowPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPreviewCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPreviewCanvas(wxPreviewCanvasPtr): + def __init__(self,*_args,**_kwargs): + self.this = printfwc.new_wxPreviewCanvas(*_args,**_kwargs) + self.thisown = 1 + self._setOORInfo(self) + + + + +class wxPreviewControlBarPtr(wxPanelPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetZoomControl(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_GetZoomControl(self, *_args, **_kwargs) + return val + def SetZoomControl(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_SetZoomControl(self, *_args, **_kwargs) + return val + def GetPrintPreview(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_GetPrintPreview(self, *_args, **_kwargs) + if val: val = wxPrintPreviewPtr(val) + return val + def OnNext(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_OnNext(self, *_args, **_kwargs) + return val + def OnPrevious(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_OnPrevious(self, *_args, **_kwargs) + return val + def OnFirst(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_OnFirst(self, *_args, **_kwargs) + return val + def OnLast(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_OnLast(self, *_args, **_kwargs) + return val + def OnGoto(self, *_args, **_kwargs): + val = printfwc.wxPreviewControlBar_OnGoto(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPreviewControlBar(wxPreviewControlBarPtr): + def __init__(self,*_args,**_kwargs): + self.this = printfwc.new_wxPreviewControlBar(*_args,**_kwargs) + self.thisown = 1 + self._setOORInfo(self) + + + + +class wxPyPrintPreviewPtr(wxPrintPreviewPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def _setCallbackInfo(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview__setCallbackInfo(self, *_args, **_kwargs) + return val + def base_SetCurrentPage(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview_base_SetCurrentPage(self, *_args, **_kwargs) + return val + def base_PaintPage(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview_base_PaintPage(self, *_args, **_kwargs) + return val + def base_DrawBlankPage(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview_base_DrawBlankPage(self, *_args, **_kwargs) + return val + def base_RenderPage(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview_base_RenderPage(self, *_args, **_kwargs) + return val + def base_SetZoom(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview_base_SetZoom(self, *_args, **_kwargs) + return val + def base_Print(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview_base_Print(self, *_args, **_kwargs) + return val + def base_DetermineScaling(self, *_args, **_kwargs): + val = printfwc.wxPyPrintPreview_base_DetermineScaling(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPyPrintPreview(wxPyPrintPreviewPtr): + def __init__(self,*_args,**_kwargs): + self.this = printfwc.new_wxPyPrintPreview(*_args,**_kwargs) + self.thisown = 1 + self._setCallbackInfo(self, wxPyPrintPreview) + + + + +class wxPyPreviewFramePtr(wxPreviewFramePtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def _setCallbackInfo(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewFrame__setCallbackInfo(self, *_args, **_kwargs) + return val + def SetPreviewCanvas(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewFrame_SetPreviewCanvas(self, *_args, **_kwargs) + return val + def SetControlBar(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewFrame_SetControlBar(self, *_args, **_kwargs) + return val + def base_Initialize(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewFrame_base_Initialize(self, *_args, **_kwargs) + return val + def base_CreateCanvas(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewFrame_base_CreateCanvas(self, *_args, **_kwargs) + return val + def base_CreateControlBar(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewFrame_base_CreateControlBar(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPyPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPyPreviewFrame(wxPyPreviewFramePtr): + def __init__(self,*_args,**_kwargs): + self.this = printfwc.new_wxPyPreviewFrame(*_args,**_kwargs) + self.thisown = 1 + self._setCallbackInfo(self, wxPyPreviewFrame) + self._setOORInfo(self) + + + + +class wxPyPreviewControlBarPtr(wxPreviewControlBarPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def _setCallbackInfo(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewControlBar__setCallbackInfo(self, *_args, **_kwargs) + return val + def SetPrintPreview(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewControlBar_SetPrintPreview(self, *_args, **_kwargs) + return val + def base_CreateButtons(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewControlBar_base_CreateButtons(self, *_args, **_kwargs) + return val + def base_SetZoomControl(self, *_args, **_kwargs): + val = printfwc.wxPyPreviewControlBar_base_SetZoomControl(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxPyPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxPyPreviewControlBar(wxPyPreviewControlBarPtr): + def __init__(self,*_args,**_kwargs): + self.this = printfwc.new_wxPyPreviewControlBar(*_args,**_kwargs) + self.thisown = 1 + self._setCallbackInfo(self, wxPyPreviewControlBar) + self._setOORInfo(self) + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -643,7 +873,32 @@ wxPostScriptDC_SetResolution = printfwc.wxPostScriptDC_SetResolution wxPostScriptDC_GetResolution = printfwc.wxPostScriptDC_GetResolution +wxPrinter_GetLastError = printfwc.wxPrinter_GetLastError + #-------------- VARIABLE WRAPPERS ------------------ +wxPRINT_MODE_NONE = printfwc.wxPRINT_MODE_NONE +wxPRINT_MODE_PREVIEW = printfwc.wxPRINT_MODE_PREVIEW +wxPRINT_MODE_FILE = printfwc.wxPRINT_MODE_FILE +wxPRINT_MODE_PRINTER = printfwc.wxPRINT_MODE_PRINTER +wxPRINTER_NO_ERROR = printfwc.wxPRINTER_NO_ERROR +wxPRINTER_CANCELLED = printfwc.wxPRINTER_CANCELLED +wxPRINTER_ERROR = printfwc.wxPRINTER_ERROR +wxPREVIEW_PRINT = printfwc.wxPREVIEW_PRINT +wxPREVIEW_PREVIOUS = printfwc.wxPREVIEW_PREVIOUS +wxPREVIEW_NEXT = printfwc.wxPREVIEW_NEXT +wxPREVIEW_ZOOM = printfwc.wxPREVIEW_ZOOM +wxPREVIEW_FIRST = printfwc.wxPREVIEW_FIRST +wxPREVIEW_LAST = printfwc.wxPREVIEW_LAST +wxPREVIEW_GOTO = printfwc.wxPREVIEW_GOTO +wxPREVIEW_DEFAULT = printfwc.wxPREVIEW_DEFAULT +wxID_PREVIEW_CLOSE = printfwc.wxID_PREVIEW_CLOSE +wxID_PREVIEW_NEXT = printfwc.wxID_PREVIEW_NEXT +wxID_PREVIEW_PREVIOUS = printfwc.wxID_PREVIEW_PREVIOUS +wxID_PREVIEW_PRINT = printfwc.wxID_PREVIEW_PRINT +wxID_PREVIEW_ZOOM = printfwc.wxID_PREVIEW_ZOOM +wxID_PREVIEW_FIRST = printfwc.wxID_PREVIEW_FIRST +wxID_PREVIEW_LAST = printfwc.wxID_PREVIEW_LAST +wxID_PREVIEW_GOTO = printfwc.wxID_PREVIEW_GOTO diff --git a/wxPython/src/msw/sizers.cpp b/wxPython/src/msw/sizers.cpp index d570c91c8f..ebf07c62b9 100644 --- a/wxPython/src/msw/sizers.cpp +++ b/wxPython/src/msw/sizers.cpp @@ -1110,98 +1110,69 @@ static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject return _resultobj; } -static void wxSizer_AddWindow(wxSizer *self,wxWindow * window,int proportion,int flag,int border,PyObject * userData) { +static void wxSizer__Add(wxSizer *self,PyObject * item,int proportion,int flag,int border,PyObject * userData,int option) { + // The option parameter is only for backwards compatibility + // with keyword args, all new code should use "proportion" + // instead. This can be removed eventually. + if (option != -1) proportion = option; + + wxWindow* window; + wxSizer* sizer; + wxSize size; + wxSize* sizePtr = &size; wxPyUserData* data = NULL; if (userData) data = new wxPyUserData(userData); - self->Add(window, proportion, flag, border, data); - } -static PyObject *_wrap_wxSizer_AddWindow(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - wxWindow * _arg1; - int _arg2 = (int ) 0; - int _arg3 = (int ) 0; - int _arg4 = (int ) 0; - PyObject * _arg5 = (PyObject *) NULL; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _obj5 = 0; - char *_kwnames[] = { "self","window","proportion","flag","border","userData", NULL }; - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_AddWindow",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_AddWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_AddWindow. Expected _wxWindow_p."); - return NULL; - } - } - if (_obj5) -{ - _arg5 = _obj5; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_AddWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + // Find out what type the item is and call the real Add method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + self->Add(window, proportion, flag, border, data); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + self->Add(sizer, proportion, flag, border, data); -static void wxSizer_AddSizer(wxSizer *self,wxSizer * sizer,int proportion,int flag,int border,PyObject * userData) { - wxPyUserData* data = NULL; - if (userData) data = new wxPyUserData(userData); - self->Add(sizer, proportion, flag, border, data); + else if (wxSize_helper(item, &sizePtr)) + self->Add(sizePtr->GetWidth(), sizePtr->GetHeight(), + proportion, flag, border, data); + else { + if (data) delete data; + PyErr_SetString(PyExc_TypeError, + "wxWindow, wxSizer, wxSize, or (w,h) expected for item"); + } } -static PyObject *_wrap_wxSizer_AddSizer(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxSizer__Add(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - wxSizer * _arg1; + PyObject * _arg1; int _arg2 = (int ) 0; int _arg3 = (int ) 0; int _arg4 = (int ) 0; PyObject * _arg5 = (PyObject *) NULL; + int _arg6 = (int ) -1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + PyObject * _obj1 = 0; PyObject * _obj5 = 0; - char *_kwnames[] = { "self","sizer","proportion","flag","border","userData", NULL }; + char *_kwnames[] = { "self","item","proportion","flag","border","userData","option", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_AddSizer",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiOi:wxSizer__Add",_kwnames,&_argo0,&_obj1,&_arg2,&_arg3,&_arg4,&_obj5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_AddSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_AddSizer. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__Add. Expected _wxSizer_p."); return NULL; } } +{ + _arg1 = _obj1; +} if (_obj5) { _arg5 = _obj5; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_AddSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + wxSizer__Add(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1210,143 +1181,70 @@ static PyObject *_wrap_wxSizer_AddSizer(PyObject *self, PyObject *args, PyObject return _resultobj; } -static void wxSizer_AddSpacer(wxSizer *self,int width,int height,int proportion,int flag,int border,PyObject * userData) { +static void wxSizer__Insert(wxSizer *self,int before,PyObject * item,int proportion,int flag,int border,PyObject * userData,int option) { + // The option parameter is only for backwards compatibility + // with keyword args, all new code should use "proportion" + // instead. This can be removed eventually. + if (option != -1) proportion = option; + + wxWindow* window; + wxSizer* sizer; + wxSize size; + wxSize* sizePtr = &size; wxPyUserData* data = NULL; if (userData) data = new wxPyUserData(userData); - self->Add(width, height, proportion, flag, border, data); - } -static PyObject *_wrap_wxSizer_AddSpacer(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - int _arg1; - int _arg2; - int _arg3 = (int ) 0; - int _arg4 = (int ) 0; - int _arg5 = (int ) 0; - PyObject * _arg6 = (PyObject *) NULL; - PyObject * _argo0 = 0; - PyObject * _obj6 = 0; - char *_kwnames[] = { "self","width","height","proportion","flag","border","userData", NULL }; - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|iiiO:wxSizer_AddSpacer",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_AddSpacer. Expected _wxSizer_p."); - return NULL; - } - } - if (_obj6) -{ - _arg6 = _obj6; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_AddSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + // Find out what type the item is and call the real Insert method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + self->Insert(before, window, proportion, flag, border, data); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + self->Insert(before, sizer, proportion, flag, border, data); -static void wxSizer_InsertWindow(wxSizer *self,int before,wxWindow * window,int proportion,int flag,int border,PyObject * userData) { - wxPyUserData* data = NULL; - if (userData) data = new wxPyUserData(userData); - self->Insert(before, window, proportion, flag, border, data); + else if (wxSize_helper(item, &sizePtr)) + self->Insert(before, sizePtr->GetWidth(), sizePtr->GetHeight(), + proportion, flag, border, data); + else { + if (data) delete data; + PyErr_SetString(PyExc_TypeError, + "wxWindow, wxSizer, wxSize, or (w,h) expected for item"); + } } -static PyObject *_wrap_wxSizer_InsertWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxSizer__Insert(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; int _arg1; - wxWindow * _arg2; + PyObject * _arg2; int _arg3 = (int ) 0; int _arg4 = (int ) 0; int _arg5 = (int ) 0; PyObject * _arg6 = (PyObject *) NULL; + int _arg7 = (int ) -1; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; + PyObject * _obj2 = 0; PyObject * _obj6 = 0; - char *_kwnames[] = { "self","before","window","proportion","flag","border","userData", NULL }; + char *_kwnames[] = { "self","before","item","proportion","flag","border","userData","option", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|iiiO:wxSizer_InsertWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&_obj6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|iiiOi:wxSizer__Insert",_kwnames,&_argo0,&_arg1,&_obj2,&_arg3,&_arg4,&_arg5,&_obj6,&_arg7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_InsertWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSizer_InsertWindow. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__Insert. Expected _wxSizer_p."); return NULL; } } - if (_obj6) -{ - _arg6 = _obj6; -} { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_InsertWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; + _arg2 = _obj2; } - -static void wxSizer_InsertSizer(wxSizer *self,int before,wxSizer * sizer,int proportion,int flag,int border,PyObject * userData) { - wxPyUserData* data = NULL; - if (userData) data = new wxPyUserData(userData); - self->Insert(before, sizer, proportion, flag, border, data); - } -static PyObject *_wrap_wxSizer_InsertSizer(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - int _arg1; - wxSizer * _arg2; - int _arg3 = (int ) 0; - int _arg4 = (int ) 0; - int _arg5 = (int ) 0; - PyObject * _arg6 = (PyObject *) NULL; - PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _obj6 = 0; - char *_kwnames[] = { "self","before","sizer","proportion","flag","border","userData", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|iiiO:wxSizer_InsertSizer",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&_obj6)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_InsertSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSizer_InsertSizer. Expected _wxSizer_p."); - return NULL; - } - } if (_obj6) { _arg6 = _obj6; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_InsertSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + wxSizer__Insert(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1355,92 +1253,69 @@ static PyObject *_wrap_wxSizer_InsertSizer(PyObject *self, PyObject *args, PyObj return _resultobj; } -static void wxSizer_InsertSpacer(wxSizer *self,int before,int width,int height,int proportion,int flag,int border,PyObject * userData) { +static void wxSizer__Prepend(wxSizer *self,PyObject * item,int proportion,int flag,int border,PyObject * userData,int option) { + // The option parameter is only for backwards compatibility + // with keyword args, all new code should use "proportion" + // instead. This can be removed eventually. + if (option != -1) proportion = option; + + wxWindow* window; + wxSizer* sizer; + wxSize size; + wxSize* sizePtr = &size; wxPyUserData* data = NULL; if (userData) data = new wxPyUserData(userData); - self->Insert(before, width, height, proportion, flag, border, data); - } -static PyObject *_wrap_wxSizer_InsertSpacer(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - int _arg1; - int _arg2; - int _arg3; - int _arg4 = (int ) 0; - int _arg5 = (int ) 0; - int _arg6 = (int ) 0; - PyObject * _arg7 = (PyObject *) NULL; - PyObject * _argo0 = 0; - PyObject * _obj7 = 0; - char *_kwnames[] = { "self","before","width","height","proportion","flag","border","userData", NULL }; - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii|iiiO:wxSizer_InsertSpacer",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_obj7)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_InsertSpacer. Expected _wxSizer_p."); - return NULL; - } - } - if (_obj7) -{ - _arg7 = _obj7; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_InsertSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7); + // Find out what type the item is and call the real Prepend method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + self->Prepend(window, proportion, flag, border, data); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + self->Prepend(sizer, proportion, flag, border, data); -static void wxSizer_PrependWindow(wxSizer *self,wxWindow * window,int proportion,int flag,int border,PyObject * userData) { - wxPyUserData* data = NULL; - if (userData) data = new wxPyUserData(userData); - self->Prepend(window, proportion, flag, border, data); + else if (wxSize_helper(item, &sizePtr)) + self->Prepend(sizePtr->GetWidth(), sizePtr->GetHeight(), + proportion, flag, border, data); + else { + if (data) delete data; + PyErr_SetString(PyExc_TypeError, + "wxWindow, wxSizer, wxSize, or (w,h) expected for item"); + } } -static PyObject *_wrap_wxSizer_PrependWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxSizer__Prepend(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - wxWindow * _arg1; + PyObject * _arg1; int _arg2 = (int ) 0; int _arg3 = (int ) 0; int _arg4 = (int ) 0; PyObject * _arg5 = (PyObject *) NULL; + int _arg6 = (int ) -1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + PyObject * _obj1 = 0; PyObject * _obj5 = 0; - char *_kwnames[] = { "self","window","proportion","flag","border","userData", NULL }; + char *_kwnames[] = { "self","item","proportion","flag","border","userData","option", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_PrependWindow",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiOi:wxSizer__Prepend",_kwnames,&_argo0,&_obj1,&_arg2,&_arg3,&_arg4,&_obj5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_PrependWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_PrependWindow. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__Prepend. Expected _wxSizer_p."); return NULL; } } +{ + _arg1 = _obj1; +} if (_obj5) { _arg5 = _obj5; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_PrependWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + wxSizer__Prepend(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1449,91 +1324,110 @@ static PyObject *_wrap_wxSizer_PrependWindow(PyObject *self, PyObject *args, PyO return _resultobj; } -static void wxSizer_PrependSizer(wxSizer *self,wxSizer * sizer,int proportion,int flag,int border,PyObject * userData) { - wxPyUserData* data = NULL; - if (userData) data = new wxPyUserData(userData); - self->Prepend(sizer, proportion, flag, border, data); +static bool wxSizer_Remove(wxSizer *self,PyObject * item) { + wxWindow* window; + wxSizer* sizer; + + // Find out what type the item is and call the real Remove method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + return self->Remove(window); + + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + return self->Remove(sizer); + + else if (PyInt_Check(item)) { + int pos = PyInt_AsLong(item); + return self->Remove(pos); + } + else { + PyErr_SetString(PyExc_TypeError, + "wxWindow, wxSizer or int (position) expected."); + return FALSE; + } } -static PyObject *_wrap_wxSizer_PrependSizer(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxSizer_Remove(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + bool _result; wxSizer * _arg0; - wxSizer * _arg1; - int _arg2 = (int ) 0; - int _arg3 = (int ) 0; - int _arg4 = (int ) 0; - PyObject * _arg5 = (PyObject *) NULL; + PyObject * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _obj5 = 0; - char *_kwnames[] = { "self","sizer","proportion","flag","border","userData", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","item", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_PrependSizer",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_Remove",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_PrependSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_PrependSizer. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_Remove. Expected _wxSizer_p."); return NULL; } } - if (_obj5) { - _arg5 = _obj5; + _arg1 = _obj1; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_PrependSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + _result = (bool )wxSizer_Remove(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -static void wxSizer_PrependSpacer(wxSizer *self,int width,int height,int proportion,int flag,int border,PyObject * userData) { - wxPyUserData* data = NULL; - if (userData) data = new wxPyUserData(userData); - self->Prepend(width, height, proportion, flag, border, data); +static void wxSizer__SetItemMinSize(wxSizer *self,PyObject * item,wxSize size) { + wxWindow* window; + wxSizer* sizer; + + // Find out what type the item is and call the real Remove method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + self->SetItemMinSize(window, size); + + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + self->SetItemMinSize(sizer, size); + + else if (PyInt_Check(item)) { + int pos = PyInt_AsLong(item); + self->SetItemMinSize(pos, size); + } + else + PyErr_SetString(PyExc_TypeError, + "wxWindow, wxSizer or int (position) expected."); } -static PyObject *_wrap_wxSizer_PrependSpacer(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxSizer__SetItemMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - int _arg1; - int _arg2; - int _arg3 = (int ) 0; - int _arg4 = (int ) 0; - int _arg5 = (int ) 0; - PyObject * _arg6 = (PyObject *) NULL; + PyObject * _arg1; + wxSize * _arg2; PyObject * _argo0 = 0; - PyObject * _obj6 = 0; - char *_kwnames[] = { "self","width","height","proportion","flag","border","userData", NULL }; + PyObject * _obj1 = 0; + wxSize temp; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","item","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|iiiO:wxSizer_PrependSpacer",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxSizer__SetItemMinSize",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_PrependSpacer. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__SetItemMinSize. Expected _wxSizer_p."); return NULL; } } - if (_obj6) { - _arg6 = _obj6; + _arg1 = _obj1; +} +{ + _arg2 = &temp; + if (! wxSize_helper(_obj2, &_arg2)) + return NULL; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_PrependSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + wxSizer__SetItemMinSize(_arg0,_arg1,*_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1542,504 +1436,30 @@ static PyObject *_wrap_wxSizer_PrependSpacer(PyObject *self, PyObject *args, PyO return _resultobj; } -#define wxSizer_RemoveWindow(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) -static PyObject *_wrap_wxSizer_RemoveWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxSizer_SetDimension(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SetDimension(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxSizer_SetDimension(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; wxSizer * _arg0; - wxWindow * _arg1; + int _arg1; + int _arg2; + int _arg3; + int _arg4; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","window", NULL }; + char *_kwnames[] = { "self","x","y","width","height", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_RemoveWindow",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_RemoveWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_RemoveWindow. Expected _wxWindow_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_RemoveWindow(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxSizer_RemoveSizer(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) -static PyObject *_wrap_wxSizer_RemoveSizer(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxSizer * _arg0; - wxSizer * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","sizer", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_RemoveSizer",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_RemoveSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_RemoveSizer. Expected _wxSizer_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_RemoveSizer(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxSizer_RemovePos(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) -static PyObject *_wrap_wxSizer_RemovePos(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxSizer * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pos", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizer_RemovePos",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_RemovePos. Expected _wxSizer_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_RemovePos(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxSizer_DetachWindow(_swigobj,_swigarg0) (_swigobj->Detach(_swigarg0)) -static PyObject *_wrap_wxSizer_DetachWindow(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxSizer * _arg0; - wxWindow * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","window", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_DetachWindow",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_DetachWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_DetachWindow. Expected _wxWindow_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_DetachWindow(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxSizer_DetachSizer(_swigobj,_swigarg0) (_swigobj->Detach(_swigarg0)) -static PyObject *_wrap_wxSizer_DetachSizer(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxSizer * _arg0; - wxSizer * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","sizer", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_DetachSizer",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_DetachSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_DetachSizer. Expected _wxSizer_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_DetachSizer(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxSizer_DetachPos(_swigobj,_swigarg0) (_swigobj->Detach(_swigarg0)) -static PyObject *_wrap_wxSizer_DetachPos(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxSizer * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pos", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizer_DetachPos",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_DetachPos. Expected _wxSizer_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_DetachPos(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxSizer_Clear(_swigobj,_swigarg0) (_swigobj->Clear(_swigarg0)) -static PyObject *_wrap_wxSizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - bool _arg1 = (bool ) false; - PyObject * _argo0 = 0; - int tempbool1 = (int) false; - char *_kwnames[] = { "self","delete_windows", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxSizer_Clear",_kwnames,&_argo0,&tempbool1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_Clear. Expected _wxSizer_p."); - return NULL; - } - } - _arg1 = (bool ) tempbool1; -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_Clear(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxSizer_DeleteWindows(_swigobj) (_swigobj->DeleteWindows()) -static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_DeleteWindows",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_DeleteWindows. Expected _wxSizer_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_DeleteWindows(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxSizer_SetMinSize(_swigobj,_swigarg0) (_swigobj->SetMinSize(_swigarg0)) -static PyObject *_wrap_wxSizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - wxSize * _arg1; - PyObject * _argo0 = 0; - wxSize temp; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","size", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_SetMinSize",_kwnames,&_argo0,&_obj1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetMinSize. Expected _wxSizer_p."); - return NULL; - } - } -{ - _arg1 = &temp; - if (! wxSize_helper(_obj1, &_arg1)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetMinSize(_arg0,*_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxSizer_SetItemMinSizeWindow(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxSizer_SetItemMinSizeWindow(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - wxWindow * _arg1; - wxSize * _arg2; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - wxSize temp; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","window","size", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxSizer_SetItemMinSizeWindow",_kwnames,&_argo0,&_argo1,&_obj2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizeWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_SetItemMinSizeWindow. Expected _wxWindow_p."); - return NULL; - } - } -{ - _arg2 = &temp; - if (! wxSize_helper(_obj2, &_arg2)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetItemMinSizeWindow(_arg0,_arg1,*_arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxSizer_SetItemMinSizeSizer(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxSizer_SetItemMinSizeSizer(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - wxSizer * _arg1; - wxSize * _arg2; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - wxSize temp; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","sizer","size", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxSizer_SetItemMinSizeSizer",_kwnames,&_argo0,&_argo1,&_obj2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizeSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_SetItemMinSizeSizer. Expected _wxSizer_p."); - return NULL; - } - } -{ - _arg2 = &temp; - if (! wxSize_helper(_obj2, &_arg2)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetItemMinSizeSizer(_arg0,_arg1,*_arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxSizer_SetItemMinSizePos(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxSizer_SetItemMinSizePos(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - int _arg1; - wxSize * _arg2; - PyObject * _argo0 = 0; - wxSize temp; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","pos","size", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxSizer_SetItemMinSizePos",_kwnames,&_argo0,&_arg1,&_obj2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizePos. Expected _wxSizer_p."); - return NULL; - } - } -{ - _arg2 = &temp; - if (! wxSize_helper(_obj2, &_arg2)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetItemMinSizePos(_arg0,_arg1,*_arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxSizer_SetItemMinSizeWindowWH(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxSizer_SetItemMinSizeWindowWH(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - wxWindow * _arg1; - int _arg2; - int _arg3; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","window","width","height", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxSizer_SetItemMinSizeWindowWH",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizeWindowWH. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_SetItemMinSizeWindowWH. Expected _wxWindow_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetItemMinSizeWindowWH(_arg0,_arg1,_arg2,_arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxSizer_SetItemMinSizeSizerWH(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxSizer_SetItemMinSizeSizerWH(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - wxSizer * _arg1; - int _arg2; - int _arg3; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","sizer","width","height", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxSizer_SetItemMinSizeSizerWH",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii:wxSizer_SetDimension",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizeSizerWH. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_SetItemMinSizeSizerWH. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetDimension. Expected _wxSizer_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetItemMinSizeSizerWH(_arg0,_arg1,_arg2,_arg3); + wxSizer_SetDimension(_arg0,_arg1,_arg2,_arg3,_arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2048,29 +1468,34 @@ static PyObject *_wrap_wxSizer_SetItemMinSizeSizerWH(PyObject *self, PyObject *a return _resultobj; } -#define wxSizer_SetItemMinSizePosWH(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxSizer_SetItemMinSizePosWH(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxSizer_SetMinSize(_swigobj,_swigarg0) (_swigobj->SetMinSize(_swigarg0)) +static PyObject *_wrap_wxSizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - int _arg1; - int _arg2; - int _arg3; + wxSize * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pos","width","height", NULL }; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxSizer_SetItemMinSizePosWH",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_SetMinSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizePosWH. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetMinSize. Expected _wxSizer_p."); return NULL; } } +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetItemMinSizePosWH(_arg0,_arg1,_arg2,_arg3); + wxSizer_SetMinSize(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2347,63 +1772,29 @@ static PyObject *_wrap_wxSizer_SetVirtualSizeHints(PyObject *self, PyObject *arg return _resultobj; } -static PyObject * wxSizer_GetChildren(wxSizer *self) { - wxSizerItemList& list = self->GetChildren(); - return wxPy_ConvertList(&list, "wxSizerItem"); - } -static PyObject *_wrap_wxSizer_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - PyObject * _result; - wxSizer * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_GetChildren",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_GetChildren. Expected _wxSizer_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (PyObject *)wxSizer_GetChildren(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -}{ - _resultobj = _result; -} - return _resultobj; -} - -#define wxSizer_SetDimension(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SetDimension(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxSizer_SetDimension(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxSizer_Clear(_swigobj,_swigarg0) (_swigobj->Clear(_swigarg0)) +static PyObject *_wrap_wxSizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - int _arg1; - int _arg2; - int _arg3; - int _arg4; + bool _arg1 = (bool ) FALSE; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","x","y","width","height", NULL }; + int tempbool1 = (int) FALSE; + char *_kwnames[] = { "self","delete_windows", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii:wxSizer_SetDimension",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxSizer_Clear",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetDimension. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_Clear. Expected _wxSizer_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_SetDimension(_arg0,_arg1,_arg2,_arg3,_arg4); + wxSizer_Clear(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2412,38 +1803,26 @@ static PyObject *_wrap_wxSizer_SetDimension(PyObject *self, PyObject *args, PyOb return _resultobj; } -#define wxSizer_ShowWindow(_swigobj,_swigarg0,_swigarg1) (_swigobj->Show(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxSizer_ShowWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxSizer_DeleteWindows(_swigobj) (_swigobj->DeleteWindows()) +static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - wxWindow * _arg1; - bool _arg2 = (bool ) TRUE; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - int tempbool2 = (int) TRUE; - char *_kwnames[] = { "self","window","show", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxSizer_ShowWindow",_kwnames,&_argo0,&_argo1,&tempbool2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_DeleteWindows",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_ShowWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_ShowWindow. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_DeleteWindows. Expected _wxSizer_p."); return NULL; } } - _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_ShowWindow(_arg0,_arg1,_arg2); + wxSizer_DeleteWindows(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2452,107 +1831,77 @@ static PyObject *_wrap_wxSizer_ShowWindow(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxSizer_ShowSizer(_swigobj,_swigarg0,_swigarg1) (_swigobj->Show(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxSizer_ShowSizer(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject * wxSizer_GetChildren(wxSizer *self) { + wxList& list = self->GetChildren(); + return wxPy_ConvertList(&list, "wxSizerItem"); + } +static PyObject *_wrap_wxSizer_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + PyObject * _result; wxSizer * _arg0; - wxSizer * _arg1; - bool _arg2 = (bool ) TRUE; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - int tempbool2 = (int) TRUE; - char *_kwnames[] = { "self","sizer","show", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxSizer_ShowSizer",_kwnames,&_argo0,&_argo1,&tempbool2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_GetChildren",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_ShowSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_ShowSizer. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_GetChildren. Expected _wxSizer_p."); return NULL; } } - _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_ShowSizer(_arg0,_arg1,_arg2); + _result = (PyObject *)wxSizer_GetChildren(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ + _resultobj = _result; +} return _resultobj; } -#define wxSizer_ShowPos(_swigobj,_swigarg0,_swigarg1) (_swigobj->Show(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxSizer_ShowPos(PyObject *self, PyObject *args, PyObject *kwargs) { +static void wxSizer_Show(wxSizer *self,PyObject * item,bool show) { + wxWindow* window; + wxSizer* sizer; + // Find out what type the item is and call the real method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + self->Show(window, show); + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + self->Show(sizer, show); + else + PyErr_SetString(PyExc_TypeError, "wxWindow or wxSizer expected."); + } +static PyObject *_wrap_wxSizer_Show(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - size_t _arg1; + PyObject * _arg1; bool _arg2 = (bool ) TRUE; PyObject * _argo0 = 0; + PyObject * _obj1 = 0; int tempbool2 = (int) TRUE; - char *_kwnames[] = { "self","index","show", NULL }; + char *_kwnames[] = { "self","item","show", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|i:wxSizer_ShowPos",_kwnames,&_argo0,&_arg1,&tempbool2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxSizer_Show",_kwnames,&_argo0,&_obj1,&tempbool2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_ShowPos. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_Show. Expected _wxSizer_p."); return NULL; } } - _arg2 = (bool ) tempbool2; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_ShowPos(_arg0,_arg1,_arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; + _arg1 = _obj1; } - -#define wxSizer_HideWindow(_swigobj,_swigarg0) (_swigobj->Hide(_swigarg0)) -static PyObject *_wrap_wxSizer_HideWindow(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - wxWindow * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","window", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_HideWindow",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_HideWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_HideWindow. Expected _wxWindow_p."); - return NULL; - } - } + _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_HideWindow(_arg0,_arg1); + wxSizer_Show(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2561,64 +1910,41 @@ static PyObject *_wrap_wxSizer_HideWindow(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxSizer_HideSizer(_swigobj,_swigarg0) (_swigobj->Hide(_swigarg0)) -static PyObject *_wrap_wxSizer_HideSizer(PyObject *self, PyObject *args, PyObject *kwargs) { +static void wxSizer_Hide(wxSizer *self,PyObject * item) { + wxWindow* window; + wxSizer* sizer; + // Find out what type the item is and call the real method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + self->Hide(window); + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + self->Hide(sizer); + else + PyErr_SetString(PyExc_TypeError, "wxWindow or wxSizer expected."); + } +static PyObject *_wrap_wxSizer_Hide(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSizer * _arg0; - wxSizer * _arg1; + PyObject * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","sizer", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","item", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_HideSizer",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_Hide",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_HideSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_HideSizer. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_Hide. Expected _wxSizer_p."); return NULL; } } { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_HideSizer(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; + _arg1 = _obj1; } - -#define wxSizer_HidePos(_swigobj,_swigarg0) (_swigobj->Hide(_swigarg0)) -static PyObject *_wrap_wxSizer_HidePos(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxSizer * _arg0; - size_t _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","index", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizer_HidePos",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_HidePos. Expected _wxSizer_p."); - return NULL; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSizer_HidePos(_arg0,_arg1); + wxSizer_Hide(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2627,102 +1953,44 @@ static PyObject *_wrap_wxSizer_HidePos(PyObject *self, PyObject *args, PyObject return _resultobj; } -#define wxSizer_IsShownWindow(_swigobj,_swigarg0) (_swigobj->IsShown(_swigarg0)) -static PyObject *_wrap_wxSizer_IsShownWindow(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxSizer * _arg0; - wxWindow * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","window", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_IsShownWindow",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_IsShownWindow. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_IsShownWindow. Expected _wxWindow_p."); - return NULL; +static bool wxSizer_IsShown(wxSizer *self,PyObject * item) { + wxWindow* window; + wxSizer* sizer; + // Find out what type the item is and call the real method + if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p")) + return self->IsShown(window); + else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p")) + return self->IsShown(sizer); + else { + PyErr_SetString(PyExc_TypeError, "wxWindow or wxSizer expected."); + return FALSE; + } } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_IsShownWindow(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxSizer_IsShownSizer(_swigobj,_swigarg0) (_swigobj->IsShown(_swigarg0)) -static PyObject *_wrap_wxSizer_IsShownSizer(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxSizer_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxSizer * _arg0; - wxSizer * _arg1; + PyObject * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","sizer", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","item", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_IsShownSizer",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_IsShown",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_IsShownSizer. Expected _wxSizer_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_IsShownSizer. Expected _wxSizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_IsShown. Expected _wxSizer_p."); return NULL; } } { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_IsShownSizer(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; + _arg1 = _obj1; } - -#define wxSizer_IsShownPos(_swigobj,_swigarg0) (_swigobj->IsShown(_swigarg0)) -static PyObject *_wrap_wxSizer_IsShownPos(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxSizer * _arg0; - size_t _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","index", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizer_IsShownPos",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_IsShownPos. Expected _wxSizer_p."); - return NULL; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSizer_IsShownPos(_arg0,_arg1); + _result = (bool )wxSizer_IsShown(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3997,17 +3265,12 @@ static PyMethodDef sizerscMethods[] = { { "wxPySizer__setCallbackInfo", (PyCFunction) _wrap_wxPySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { "new_wxPySizer", (PyCFunction) _wrap_new_wxPySizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_ShowItems", (PyCFunction) _wrap_wxSizer_ShowItems, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_IsShownPos", (PyCFunction) _wrap_wxSizer_IsShownPos, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_IsShownSizer", (PyCFunction) _wrap_wxSizer_IsShownSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_IsShownWindow", (PyCFunction) _wrap_wxSizer_IsShownWindow, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_HidePos", (PyCFunction) _wrap_wxSizer_HidePos, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_HideSizer", (PyCFunction) _wrap_wxSizer_HideSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_HideWindow", (PyCFunction) _wrap_wxSizer_HideWindow, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_ShowPos", (PyCFunction) _wrap_wxSizer_ShowPos, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_ShowSizer", (PyCFunction) _wrap_wxSizer_ShowSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_ShowWindow", (PyCFunction) _wrap_wxSizer_ShowWindow, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_SetDimension", (PyCFunction) _wrap_wxSizer_SetDimension, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_IsShown", (PyCFunction) _wrap_wxSizer_IsShown, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_Hide", (PyCFunction) _wrap_wxSizer_Hide, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_Show", (PyCFunction) _wrap_wxSizer_Show, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_GetChildren", (PyCFunction) _wrap_wxSizer_GetChildren, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_DeleteWindows", (PyCFunction) _wrap_wxSizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_Clear", (PyCFunction) _wrap_wxSizer_Clear, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_SetVirtualSizeHints", (PyCFunction) _wrap_wxSizer_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_SetSizeHints", (PyCFunction) _wrap_wxSizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_FitInside", (PyCFunction) _wrap_wxSizer_FitInside, METH_VARARGS | METH_KEYWORDS }, @@ -4016,30 +3279,13 @@ static PyMethodDef sizerscMethods[] = { { "wxSizer_GetMinSize", (PyCFunction) _wrap_wxSizer_GetMinSize, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_GetPosition", (PyCFunction) _wrap_wxSizer_GetPosition, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_GetSize", (PyCFunction) _wrap_wxSizer_GetSize, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_SetItemMinSizePosWH", (PyCFunction) _wrap_wxSizer_SetItemMinSizePosWH, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_SetItemMinSizeSizerWH", (PyCFunction) _wrap_wxSizer_SetItemMinSizeSizerWH, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_SetItemMinSizeWindowWH", (PyCFunction) _wrap_wxSizer_SetItemMinSizeWindowWH, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_SetItemMinSizePos", (PyCFunction) _wrap_wxSizer_SetItemMinSizePos, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_SetItemMinSizeSizer", (PyCFunction) _wrap_wxSizer_SetItemMinSizeSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_SetItemMinSizeWindow", (PyCFunction) _wrap_wxSizer_SetItemMinSizeWindow, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_SetMinSize", (PyCFunction) _wrap_wxSizer_SetMinSize, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_DeleteWindows", (PyCFunction) _wrap_wxSizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_Clear", (PyCFunction) _wrap_wxSizer_Clear, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_DetachPos", (PyCFunction) _wrap_wxSizer_DetachPos, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_DetachSizer", (PyCFunction) _wrap_wxSizer_DetachSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_DetachWindow", (PyCFunction) _wrap_wxSizer_DetachWindow, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_RemovePos", (PyCFunction) _wrap_wxSizer_RemovePos, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_RemoveSizer", (PyCFunction) _wrap_wxSizer_RemoveSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_RemoveWindow", (PyCFunction) _wrap_wxSizer_RemoveWindow, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_PrependSpacer", (PyCFunction) _wrap_wxSizer_PrependSpacer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_PrependSizer", (PyCFunction) _wrap_wxSizer_PrependSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_PrependWindow", (PyCFunction) _wrap_wxSizer_PrependWindow, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_InsertSpacer", (PyCFunction) _wrap_wxSizer_InsertSpacer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_InsertSizer", (PyCFunction) _wrap_wxSizer_InsertSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_InsertWindow", (PyCFunction) _wrap_wxSizer_InsertWindow, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_AddSpacer", (PyCFunction) _wrap_wxSizer_AddSpacer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_AddSizer", (PyCFunction) _wrap_wxSizer_AddSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_SetDimension", (PyCFunction) _wrap_wxSizer_SetDimension, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer__SetItemMinSize", (PyCFunction) _wrap_wxSizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_Remove", (PyCFunction) _wrap_wxSizer_Remove, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer__Prepend", (PyCFunction) _wrap_wxSizer__Prepend, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer__Insert", (PyCFunction) _wrap_wxSizer__Insert, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer__Add", (PyCFunction) _wrap_wxSizer__Add, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Destroy", (PyCFunction) _wrap_wxSizer_Destroy, METH_VARARGS | METH_KEYWORDS }, { "wxSizer__setOORInfo", (PyCFunction) _wrap_wxSizer__setOORInfo, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/sizers.py b/wxPython/src/msw/sizers.py index 64306d0a6d..e9e3f18dbd 100644 --- a/wxPython/src/msw/sizers.py +++ b/wxPython/src/msw/sizers.py @@ -20,102 +20,102 @@ class wxSizerItemPtr(wxObjectPtr): self.this = this self.thisown = 0 def DeleteWindows(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_DeleteWindows,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_DeleteWindows(self, *_args, **_kwargs) return val def DetachSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_DetachSizer,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_DetachSizer(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetSize,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def CalcMin(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_CalcMin,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_CalcMin(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetDimension(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetDimension,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetDimension(self, *_args, **_kwargs) return val def GetMinSize(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetMinSize,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetMinSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetInitSize(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetInitSize,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetInitSize(self, *_args, **_kwargs) return val def SetRatioWH(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetRatioWH,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetRatioWH(self, *_args, **_kwargs) return val def SetRatioSize(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetRatioSize,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetRatioSize(self, *_args, **_kwargs) return val def SetRatio(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetRatio,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetRatio(self, *_args, **_kwargs) return val def GetRatio(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetRatio,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetRatio(self, *_args, **_kwargs) return val def IsWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_IsWindow,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_IsWindow(self, *_args, **_kwargs) return val def IsSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_IsSizer,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_IsSizer(self, *_args, **_kwargs) return val def IsSpacer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_IsSpacer,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_IsSpacer(self, *_args, **_kwargs) return val def SetProportion(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetProportion,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetProportion(self, *_args, **_kwargs) return val def GetProportion(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetProportion,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetProportion(self, *_args, **_kwargs) return val def SetFlag(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetFlag,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetFlag(self, *_args, **_kwargs) return val def GetFlag(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetFlag,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetFlag(self, *_args, **_kwargs) return val def SetBorder(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetBorder,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetBorder(self, *_args, **_kwargs) return val def GetBorder(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetBorder,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetBorder(self, *_args, **_kwargs) return val def GetWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetWindow,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetWindow(self, *_args, **_kwargs) return val def SetWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetWindow,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetWindow(self, *_args, **_kwargs) return val def GetSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetSizer,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetSizer(self, *_args, **_kwargs) return val def SetSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetSizer,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetSizer(self, *_args, **_kwargs) return val def GetSpacer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetSpacer,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetSpacer(self, *_args, **_kwargs) if val: val = wxSizePtr(val) return val def SetSpacer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_SetSpacer,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_SetSpacer(self, *_args, **_kwargs) return val def Show(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_Show,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_Show(self, *_args, **_kwargs) return val def IsShown(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_IsShown,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_IsShown(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetPosition,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetUserData(self, *_args, **_kwargs): - val = apply(sizersc.wxSizerItem_GetUserData,(self,) + _args, _kwargs) + val = sizersc.wxSizerItem_GetUserData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSizerItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) SetOption = SetProportion GetOption = GetProportion class wxSizerItem(wxSizerItemPtr): @@ -130,227 +130,123 @@ class wxSizerPtr(wxObjectPtr): self.this = this self.thisown = 0 def _setOORInfo(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer__setOORInfo,(self,) + _args, _kwargs) + val = sizersc.wxSizer__setOORInfo(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_Destroy,(self,) + _args, _kwargs) + val = sizersc.wxSizer_Destroy(self, *_args, **_kwargs) return val - def AddWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_AddWindow,(self,) + _args, _kwargs) + def _Add(self, *_args, **_kwargs): + val = sizersc.wxSizer__Add(self, *_args, **_kwargs) return val - def AddSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_AddSizer,(self,) + _args, _kwargs) + def _Insert(self, *_args, **_kwargs): + val = sizersc.wxSizer__Insert(self, *_args, **_kwargs) return val - def AddSpacer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_AddSpacer,(self,) + _args, _kwargs) + def _Prepend(self, *_args, **_kwargs): + val = sizersc.wxSizer__Prepend(self, *_args, **_kwargs) return val - def InsertWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_InsertWindow,(self,) + _args, _kwargs) + def Remove(self, *_args, **_kwargs): + val = sizersc.wxSizer_Remove(self, *_args, **_kwargs) return val - def InsertSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_InsertSizer,(self,) + _args, _kwargs) + def _SetItemMinSize(self, *_args, **_kwargs): + val = sizersc.wxSizer__SetItemMinSize(self, *_args, **_kwargs) return val - def InsertSpacer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_InsertSpacer,(self,) + _args, _kwargs) - return val - def PrependWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_PrependWindow,(self,) + _args, _kwargs) - return val - def PrependSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_PrependSizer,(self,) + _args, _kwargs) - return val - def PrependSpacer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_PrependSpacer,(self,) + _args, _kwargs) - return val - def RemoveWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_RemoveWindow,(self,) + _args, _kwargs) - return val - def RemoveSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_RemoveSizer,(self,) + _args, _kwargs) - return val - def RemovePos(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_RemovePos,(self,) + _args, _kwargs) - return val - def DetachWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_DetachWindow,(self,) + _args, _kwargs) - return val - def DetachSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_DetachSizer,(self,) + _args, _kwargs) - return val - def DetachPos(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_DetachPos,(self,) + _args, _kwargs) - return val - def Clear(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_Clear,(self,) + _args, _kwargs) - return val - def DeleteWindows(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_DeleteWindows,(self,) + _args, _kwargs) + def SetDimension(self, *_args, **_kwargs): + val = sizersc.wxSizer_SetDimension(self, *_args, **_kwargs) return val def SetMinSize(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetMinSize,(self,) + _args, _kwargs) - return val - def SetItemMinSizeWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetItemMinSizeWindow,(self,) + _args, _kwargs) - return val - def SetItemMinSizeSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetItemMinSizeSizer,(self,) + _args, _kwargs) - return val - def SetItemMinSizePos(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetItemMinSizePos,(self,) + _args, _kwargs) - return val - def SetItemMinSizeWindowWH(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetItemMinSizeWindowWH,(self,) + _args, _kwargs) - return val - def SetItemMinSizeSizerWH(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetItemMinSizeSizerWH,(self,) + _args, _kwargs) - return val - def SetItemMinSizePosWH(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetItemMinSizePosWH,(self,) + _args, _kwargs) + val = sizersc.wxSizer_SetMinSize(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_GetSize,(self,) + _args, _kwargs) + val = sizersc.wxSizer_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetPosition(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_GetPosition,(self,) + _args, _kwargs) + val = sizersc.wxSizer_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetMinSize(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_GetMinSize,(self,) + _args, _kwargs) + val = sizersc.wxSizer_GetMinSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def Layout(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_Layout,(self,) + _args, _kwargs) + val = sizersc.wxSizer_Layout(self, *_args, **_kwargs) return val def Fit(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_Fit,(self,) + _args, _kwargs) + val = sizersc.wxSizer_Fit(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def FitInside(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_FitInside,(self,) + _args, _kwargs) + val = sizersc.wxSizer_FitInside(self, *_args, **_kwargs) return val def SetSizeHints(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetSizeHints,(self,) + _args, _kwargs) + val = sizersc.wxSizer_SetSizeHints(self, *_args, **_kwargs) return val def SetVirtualSizeHints(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetVirtualSizeHints,(self,) + _args, _kwargs) - return val - def GetChildren(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_GetChildren,(self,) + _args, _kwargs) - return val - def SetDimension(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_SetDimension,(self,) + _args, _kwargs) - return val - def ShowWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_ShowWindow,(self,) + _args, _kwargs) + val = sizersc.wxSizer_SetVirtualSizeHints(self, *_args, **_kwargs) return val - def ShowSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_ShowSizer,(self,) + _args, _kwargs) - return val - def ShowPos(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_ShowPos,(self,) + _args, _kwargs) - return val - def HideWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_HideWindow,(self,) + _args, _kwargs) + def Clear(self, *_args, **_kwargs): + val = sizersc.wxSizer_Clear(self, *_args, **_kwargs) return val - def HideSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_HideSizer,(self,) + _args, _kwargs) + def DeleteWindows(self, *_args, **_kwargs): + val = sizersc.wxSizer_DeleteWindows(self, *_args, **_kwargs) return val - def HidePos(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_HidePos,(self,) + _args, _kwargs) + def GetChildren(self, *_args, **_kwargs): + val = sizersc.wxSizer_GetChildren(self, *_args, **_kwargs) return val - def IsShownWindow(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_IsShownWindow,(self,) + _args, _kwargs) + def Show(self, *_args, **_kwargs): + val = sizersc.wxSizer_Show(self, *_args, **_kwargs) return val - def IsShownSizer(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_IsShownSizer,(self,) + _args, _kwargs) + def Hide(self, *_args, **_kwargs): + val = sizersc.wxSizer_Hide(self, *_args, **_kwargs) return val - def IsShownPos(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_IsShownPos,(self,) + _args, _kwargs) + def IsShown(self, *_args, **_kwargs): + val = sizersc.wxSizer_IsShown(self, *_args, **_kwargs) return val def ShowItems(self, *_args, **_kwargs): - val = apply(sizersc.wxSizer_ShowItems,(self,) + _args, _kwargs) + val = sizersc.wxSizer_ShowItems(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) - def Add(self, *args, **kw): - if type(args[0]) == type(1): - apply(self.AddSpacer, args, kw) - elif isinstance(args[0], wxSizerPtr): - apply(self.AddSizer, args, kw) - elif isinstance(args[0], wxWindowPtr): - apply(self.AddWindow, args, kw) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - - def Insert(self, *args, **kw): - if type(args[1]) == type(1): - apply(self.InsertSpacer, args, kw) - elif isinstance(args[1], wxSizerPtr): - apply(self.InsertSizer, args, kw) - elif isinstance(args[1], wxWindowPtr): - apply(self.InsertWindow, args, kw) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - - def Prepend(self, *args, **kw): - if type(args[0]) == type(1): - apply(self.PrependSpacer, args, kw) - elif isinstance(args[0], wxSizerPtr): - apply(self.PrependSizer, args, kw) - elif isinstance(args[0], wxWindowPtr): - apply(self.PrependWindow, args, kw) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - - def Remove(self, *args, **kw): - if type(args[0]) == type(1): - return apply(self.RemovePos, args, kw) - elif isinstance(args[0], wxSizerPtr): - return apply(self.RemoveSizer, args, kw) - elif isinstance(args[0], wxWindowPtr): - return apply(self.RemoveWindow, args, kw) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - - def Detach(self, *args, **kw): - if type(args[0]) == type(1): - return apply(self.DetachPos, args, kw) - elif isinstance(args[0], wxSizerPtr): - return apply(self.DetachSizer, args, kw) - elif isinstance(args[0], wxWindowPtr): - return apply(self.DetachWindow, args, kw) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' + def Add(self, item, *args, **kw): + if type(item) == type(1): + item = (item, args[0]) # backwards compatibility, args are width, height + args = args[1:] + self._Add(item, *args, **kw) def AddMany(self, widgets): for childinfo in widgets: if type(childinfo) != type(()): childinfo = (childinfo, ) - apply(self.Add, childinfo) + self.Add(*childinfo) - - def SetItemMinSize(self, *args): - if type(args[0]) == type(1): - apply(self.SetItemMinSizePos, args) - elif isinstance(args[0], wxSizerPtr): - apply(self.SetItemMinSizeSizer, args) - elif isinstance(args[0], wxWindowPtr): - apply(self.SetItemMinSizeWindow, args) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - - def SetItemMinSizeWH(self, *args): - if type(args[0]) == type(1): - apply(self.SetItemMinSizePosWH, args) - elif isinstance(args[0], wxSizerPtr): - apply(self.SetItemMinSizeSizerWH, args) - elif isinstance(args[0], wxWindowPtr): - apply(self.SetItemMinSizeWindowWH, args) + def Prepend(self, item, *args, **kw): + if type(item) == type(1): + item = (item, args[0]) # backwards compatibility, args are width, height + args = args[1:] + self._Prepend(item, *args, **kw) + + def Insert(self, before, item, *args, **kw): + if type(item) == type(1): + item = (item, args[0]) # backwards compatibility, args are width, height + args = args[1:] + self._Insert(before, item, *args, **kw) + + + # for backwards compatibility only + AddWindow = AddSizer = AddSpacer = Add + PrependWindow = PrependSizer = PrependSpacer = Prepend + InsertWindow = InsertSizer = InsertSpacer = Insert + RemoveWindow = RemoveSizer = RemovePos = Remove + + + def SetItemMinSize(self, item, *args): + if len(args) == 2: + return self._SetItemMinSize(item, args) else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - + return self._SetItemMinSize(item, args[0]) + + def GetSizeTuple(self): return self.GetSize().asTuple() @@ -359,37 +255,6 @@ class wxSizerPtr(wxObjectPtr): def GetMinSizeTuple(self): return self.GetMinSize().asTuple() - - def Show(self, *args): - if type(args[0]) == type(1): - apply(self.ShowPos, args) - elif isinstance(args[0], wxSizerPtr): - apply(self.ShowSizer, args) - elif isinstance(args[0], wxWindowPtr): - apply(self.ShowWindow, args) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - - def Hide(self, *args): - if type(args[0]) == type(1): - apply(self.HidePos, args) - elif isinstance(args[0], wxSizerPtr): - apply(self.HideSizer, args) - elif isinstance(args[0], wxWindowPtr): - apply(self.HideWindow, args) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - - def IsShown(self, *args): - if type(args[0]) == type(1): - return apply(self.IsShownPos, args) - elif isinstance(args[0], wxSizerPtr): - return apply(self.IsShownSizer, args) - elif isinstance(args[0], wxWindowPtr): - return apply(self.IsShownWindow, args) - else: - raise TypeError, 'Expected int, wxSizer or wxWindow parameter' - class wxSizer(wxSizerPtr): def __init__(self,this): self.this = this @@ -402,13 +267,13 @@ class wxPySizerPtr(wxSizerPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(sizersc.wxPySizer__setCallbackInfo,(self,) + _args, _kwargs) + val = sizersc.wxPySizer__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPySizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPySizer(wxPySizerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(sizersc.new_wxPySizer,_args,_kwargs) + self.this = sizersc.new_wxPySizer(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPySizer) self._setOORInfo(self) @@ -421,23 +286,23 @@ class wxBoxSizerPtr(wxSizerPtr): self.this = this self.thisown = 0 def GetOrientation(self, *_args, **_kwargs): - val = apply(sizersc.wxBoxSizer_GetOrientation,(self,) + _args, _kwargs) + val = sizersc.wxBoxSizer_GetOrientation(self, *_args, **_kwargs) return val def SetOrientation(self, *_args, **_kwargs): - val = apply(sizersc.wxBoxSizer_SetOrientation,(self,) + _args, _kwargs) + val = sizersc.wxBoxSizer_SetOrientation(self, *_args, **_kwargs) return val def RecalcSizes(self, *_args, **_kwargs): - val = apply(sizersc.wxBoxSizer_RecalcSizes,(self,) + _args, _kwargs) + val = sizersc.wxBoxSizer_RecalcSizes(self, *_args, **_kwargs) return val def CalcMin(self, *_args, **_kwargs): - val = apply(sizersc.wxBoxSizer_CalcMin,(self,) + _args, _kwargs) + val = sizersc.wxBoxSizer_CalcMin(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxBoxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxBoxSizer(wxBoxSizerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(sizersc.new_wxBoxSizer,_args,_kwargs) + self.this = sizersc.new_wxBoxSizer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -449,20 +314,20 @@ class wxStaticBoxSizerPtr(wxBoxSizerPtr): self.this = this self.thisown = 0 def GetStaticBox(self, *_args, **_kwargs): - val = apply(sizersc.wxStaticBoxSizer_GetStaticBox,(self,) + _args, _kwargs) + val = sizersc.wxStaticBoxSizer_GetStaticBox(self, *_args, **_kwargs) return val def RecalcSizes(self, *_args, **_kwargs): - val = apply(sizersc.wxStaticBoxSizer_RecalcSizes,(self,) + _args, _kwargs) + val = sizersc.wxStaticBoxSizer_RecalcSizes(self, *_args, **_kwargs) return val def CalcMin(self, *_args, **_kwargs): - val = apply(sizersc.wxStaticBoxSizer_CalcMin,(self,) + _args, _kwargs) + val = sizersc.wxStaticBoxSizer_CalcMin(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxStaticBoxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStaticBoxSizer(wxStaticBoxSizerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(sizersc.new_wxStaticBoxSizer,_args,_kwargs) + self.this = sizersc.new_wxStaticBoxSizer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -474,20 +339,20 @@ class wxNotebookSizerPtr(wxSizerPtr): self.this = this self.thisown = 0 def RecalcSizes(self, *_args, **_kwargs): - val = apply(sizersc.wxNotebookSizer_RecalcSizes,(self,) + _args, _kwargs) + val = sizersc.wxNotebookSizer_RecalcSizes(self, *_args, **_kwargs) return val def CalcMin(self, *_args, **_kwargs): - val = apply(sizersc.wxNotebookSizer_CalcMin,(self,) + _args, _kwargs) + val = sizersc.wxNotebookSizer_CalcMin(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetNotebook(self, *_args, **_kwargs): - val = apply(sizersc.wxNotebookSizer_GetNotebook,(self,) + _args, _kwargs) + val = sizersc.wxNotebookSizer_GetNotebook(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxNotebookSizer(wxNotebookSizerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(sizersc.new_wxNotebookSizer,_args,_kwargs) + self.this = sizersc.new_wxNotebookSizer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -499,41 +364,41 @@ class wxGridSizerPtr(wxSizerPtr): self.this = this self.thisown = 0 def RecalcSizes(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_RecalcSizes,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_RecalcSizes(self, *_args, **_kwargs) return val def CalcMin(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_CalcMin,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_CalcMin(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetCols(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_SetCols,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_SetCols(self, *_args, **_kwargs) return val def SetRows(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_SetRows,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_SetRows(self, *_args, **_kwargs) return val def SetVGap(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_SetVGap,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_SetVGap(self, *_args, **_kwargs) return val def SetHGap(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_SetHGap,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_SetHGap(self, *_args, **_kwargs) return val def GetCols(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_GetCols,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_GetCols(self, *_args, **_kwargs) return val def GetRows(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_GetRows,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_GetRows(self, *_args, **_kwargs) return val def GetVGap(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_GetVGap,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_GetVGap(self, *_args, **_kwargs) return val def GetHGap(self, *_args, **_kwargs): - val = apply(sizersc.wxGridSizer_GetHGap,(self,) + _args, _kwargs) + val = sizersc.wxGridSizer_GetHGap(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxGridSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxGridSizer(wxGridSizerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(sizersc.new_wxGridSizer,_args,_kwargs) + self.this = sizersc.new_wxGridSizer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -545,41 +410,41 @@ class wxFlexGridSizerPtr(wxGridSizerPtr): self.this = this self.thisown = 0 def RecalcSizes(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_RecalcSizes,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_RecalcSizes(self, *_args, **_kwargs) return val def CalcMin(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_CalcMin,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_CalcMin(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def AddGrowableRow(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_AddGrowableRow,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_AddGrowableRow(self, *_args, **_kwargs) return val def RemoveGrowableRow(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_RemoveGrowableRow,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_RemoveGrowableRow(self, *_args, **_kwargs) return val def AddGrowableCol(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_AddGrowableCol,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_AddGrowableCol(self, *_args, **_kwargs) return val def RemoveGrowableCol(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_RemoveGrowableCol,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_RemoveGrowableCol(self, *_args, **_kwargs) return val def SetFlexibleDirection(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_SetFlexibleDirection,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_SetFlexibleDirection(self, *_args, **_kwargs) return val def GetFlexibleDirection(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_GetFlexibleDirection,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_GetFlexibleDirection(self, *_args, **_kwargs) return val def SetNonFlexibleGrowMode(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_SetNonFlexibleGrowMode,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_SetNonFlexibleGrowMode(self, *_args, **_kwargs) return val def GetNonFlexibleGrowMode(self, *_args, **_kwargs): - val = apply(sizersc.wxFlexGridSizer_GetNonFlexibleGrowMode,(self,) + _args, _kwargs) + val = sizersc.wxFlexGridSizer_GetNonFlexibleGrowMode(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFlexGridSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFlexGridSizer(wxFlexGridSizerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(sizersc.new_wxFlexGridSizer,_args,_kwargs) + self.this = sizersc.new_wxFlexGridSizer(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) diff --git a/wxPython/src/msw/stattool.cpp b/wxPython/src/msw/stattool.cpp index 6f93f742d3..33e29a043f 100644 --- a/wxPython/src/msw/stattool.cpp +++ b/wxPython/src/msw/stattool.cpp @@ -2290,6 +2290,35 @@ static PyObject *_wrap_wxToolBarBase_SetToolClientData(PyObject *self, PyObject return _resultobj; } +#define wxToolBarBase_GetToolPos(_swigobj,_swigarg0) (_swigobj->GetToolPos(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_GetToolPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxToolBarBase * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","id", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_GetToolPos",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolPos. Expected _wxToolBarBase_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxToolBarBase_GetToolPos(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarBase_GetToolState(_swigobj,_swigarg0) (_swigobj->GetToolState(_swigarg0)) static PyObject *_wrap_wxToolBarBase_GetToolState(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3061,7 +3090,7 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k wxWindowID _arg1; wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; wxSize * _arg3 = (wxSize *) &wxDefaultSize; - long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL; + long _arg4 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL); wxString * _arg5 = (wxString *) &wxPyToolBarNameStr; PyObject * _argo0 = 0; wxPoint temp; @@ -3155,7 +3184,7 @@ static PyObject *_wrap_wxToolBar_Create(PyObject *self, PyObject *args, PyObject wxWindowID _arg2; wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) wxNO_BORDER|wxTB_HORIZONTAL; + long _arg5 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL); wxString * _arg6 = (wxString *) &wxPyToolBarNameStr; PyObject * _argo0 = 0; PyObject * _argo1 = 0; @@ -3293,7 +3322,7 @@ static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObj wxWindowID _arg1; wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; wxSize * _arg3 = (wxSize *) &wxDefaultSize; - long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL; + long _arg4 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL); wxString * _arg5 = (wxString *) &wxPyToolBarNameStr; PyObject * _argo0 = 0; wxPoint temp; @@ -3387,7 +3416,7 @@ static PyObject *_wrap_wxToolBarSimple_Create(PyObject *self, PyObject *args, Py wxWindowID _arg2; wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) wxNO_BORDER|wxTB_HORIZONTAL; + long _arg5 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL); wxString * _arg6 = (wxString *) &wxPyToolBarNameStr; PyObject * _argo0 = 0; PyObject * _argo1 = 0; @@ -3509,6 +3538,7 @@ static PyMethodDef stattoolcMethods[] = { { "wxToolBarBase_SetToolShortHelp", (PyCFunction) _wrap_wxToolBarBase_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_GetToolEnabled", (PyCFunction) _wrap_wxToolBarBase_GetToolEnabled, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_GetToolState", (PyCFunction) _wrap_wxToolBarBase_GetToolState, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolPos", (PyCFunction) _wrap_wxToolBarBase_GetToolPos, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_SetToolClientData", (PyCFunction) _wrap_wxToolBarBase_SetToolClientData, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_GetToolClientData", (PyCFunction) _wrap_wxToolBarBase_GetToolClientData, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_SetToggle", (PyCFunction) _wrap_wxToolBarBase_SetToggle, METH_VARARGS | METH_KEYWORDS }, @@ -3705,6 +3735,17 @@ SWIGEXPORT(void) initstattoolc() { PyDict_SetItemString(d,"wxTOOL_STYLE_BUTTON", PyInt_FromLong((long) wxTOOL_STYLE_BUTTON)); PyDict_SetItemString(d,"wxTOOL_STYLE_SEPARATOR", PyInt_FromLong((long) wxTOOL_STYLE_SEPARATOR)); PyDict_SetItemString(d,"wxTOOL_STYLE_CONTROL", PyInt_FromLong((long) wxTOOL_STYLE_CONTROL)); + PyDict_SetItemString(d,"wxTB_HORIZONTAL", PyInt_FromLong((long) wxTB_HORIZONTAL)); + PyDict_SetItemString(d,"wxTB_VERTICAL", PyInt_FromLong((long) wxTB_VERTICAL)); + PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS)); + PyDict_SetItemString(d,"wxTB_FLAT", PyInt_FromLong((long) wxTB_FLAT)); + PyDict_SetItemString(d,"wxTB_DOCKABLE", PyInt_FromLong((long) wxTB_DOCKABLE)); + PyDict_SetItemString(d,"wxTB_NOICONS", PyInt_FromLong((long) wxTB_NOICONS)); + PyDict_SetItemString(d,"wxTB_TEXT", PyInt_FromLong((long) wxTB_TEXT)); + PyDict_SetItemString(d,"wxTB_NODIVIDER", PyInt_FromLong((long) wxTB_NODIVIDER)); + PyDict_SetItemString(d,"wxTB_NOALIGN", PyInt_FromLong((long) wxTB_NOALIGN)); + PyDict_SetItemString(d,"wxTB_HORZ_LAYOUT", PyInt_FromLong((long) wxTB_HORZ_LAYOUT)); + PyDict_SetItemString(d,"wxTB_HORZ_TEXT", PyInt_FromLong((long) wxTB_HORZ_TEXT)); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/wxPython/src/msw/stattool.py b/wxPython/src/msw/stattool.py index 0c74eee1b4..6468b06517 100644 --- a/wxPython/src/msw/stattool.py +++ b/wxPython/src/msw/stattool.py @@ -21,54 +21,54 @@ class wxStatusBarPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_Create,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_Create(self, *_args, **_kwargs) return val def GetFieldRect(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_GetFieldRect,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_GetFieldRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def GetFieldsCount(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_GetFieldsCount,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_GetFieldsCount(self, *_args, **_kwargs) return val def GetStatusText(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_GetStatusText,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_GetStatusText(self, *_args, **_kwargs) return val def GetBorderX(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_GetBorderX,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_GetBorderX(self, *_args, **_kwargs) return val def GetBorderY(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_GetBorderY,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_GetBorderY(self, *_args, **_kwargs) return val def SetFieldsCount(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_SetFieldsCount,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_SetFieldsCount(self, *_args, **_kwargs) return val def SetStatusText(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_SetStatusText,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_SetStatusText(self, *_args, **_kwargs) return val def SetStatusWidths(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_SetStatusWidths(self, *_args, **_kwargs) return val def PushStatusText(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_PushStatusText,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_PushStatusText(self, *_args, **_kwargs) return val def PopStatusText(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_PopStatusText,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_PopStatusText(self, *_args, **_kwargs) return val def SetMinHeight(self, *_args, **_kwargs): - val = apply(stattoolc.wxStatusBar_SetMinHeight,(self,) + _args, _kwargs) + val = stattoolc.wxStatusBar_SetMinHeight(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStatusBar(wxStatusBarPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(stattoolc.new_wxStatusBar,_args,_kwargs) + self.this = stattoolc.new_wxStatusBar(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreStatusBar(*_args,**_kwargs): - val = wxStatusBarPtr(apply(stattoolc.new_wxPreStatusBar,_args,_kwargs)) + val = wxStatusBarPtr(stattoolc.new_wxPreStatusBar(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -79,100 +79,100 @@ class wxToolBarToolBasePtr(wxObjectPtr): self.this = this self.thisown = 0 def Destroy(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_Destroy,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_Destroy(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetId,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetId(self, *_args, **_kwargs) return val def GetControl(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetControl,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetControl(self, *_args, **_kwargs) return val def GetToolBar(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetToolBar,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetToolBar(self, *_args, **_kwargs) return val def IsButton(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_IsButton,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_IsButton(self, *_args, **_kwargs) return val def IsControl(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_IsControl,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_IsControl(self, *_args, **_kwargs) return val def IsSeparator(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_IsSeparator,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_IsSeparator(self, *_args, **_kwargs) return val def GetStyle(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetStyle,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetStyle(self, *_args, **_kwargs) return val def GetKind(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetKind,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetKind(self, *_args, **_kwargs) return val def IsEnabled(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_IsEnabled,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_IsEnabled(self, *_args, **_kwargs) return val def IsToggled(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_IsToggled,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_IsToggled(self, *_args, **_kwargs) return val def CanBeToggled(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_CanBeToggled,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_CanBeToggled(self, *_args, **_kwargs) return val def GetNormalBitmap(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetNormalBitmap,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetNormalBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) return val def GetDisabledBitmap(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetDisabledBitmap,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetDisabledBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) return val def GetBitmap(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetBitmap,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def GetLabel(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetLabel,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetLabel(self, *_args, **_kwargs) return val def GetShortHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetShortHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetShortHelp(self, *_args, **_kwargs) return val def GetLongHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetLongHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetLongHelp(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_Enable,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_Enable(self, *_args, **_kwargs) return val def Toggle(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_Toggle,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_Toggle(self, *_args, **_kwargs) return val def SetToggle(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_SetToggle,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_SetToggle(self, *_args, **_kwargs) return val def SetShortHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_SetShortHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_SetShortHelp(self, *_args, **_kwargs) return val def SetLongHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_SetLongHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_SetLongHelp(self, *_args, **_kwargs) return val def SetNormalBitmap(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_SetNormalBitmap,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_SetNormalBitmap(self, *_args, **_kwargs) return val def SetDisabledBitmap(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_SetDisabledBitmap,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_SetDisabledBitmap(self, *_args, **_kwargs) return val def SetLabel(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_SetLabel,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_SetLabel(self, *_args, **_kwargs) return val def Detach(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_Detach,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_Detach(self, *_args, **_kwargs) return val def Attach(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_Attach,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_Attach(self, *_args, **_kwargs) return val def GetClientData(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_GetClientData,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_GetClientData(self, *_args, **_kwargs) return val def SetClientData(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarToolBase_SetClientData,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarToolBase_SetClientData(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxToolBarToolBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) GetBitmap1 = GetNormalBitmap GetBitmap2 = GetDisabledBitmap @@ -191,131 +191,134 @@ class wxToolBarBasePtr(wxControlPtr): self.this = this self.thisown = 0 def DoAddTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_DoAddTool,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_DoAddTool(self, *_args, **_kwargs) return val def DoInsertTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_DoInsertTool,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_DoInsertTool(self, *_args, **_kwargs) return val def AddControl(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_AddControl,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_AddControl(self, *_args, **_kwargs) return val def InsertControl(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_InsertControl,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_InsertControl(self, *_args, **_kwargs) return val def FindControl(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_FindControl,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_FindControl(self, *_args, **_kwargs) return val def AddSeparator(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_AddSeparator,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_AddSeparator(self, *_args, **_kwargs) return val def InsertSeparator(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_InsertSeparator,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_InsertSeparator(self, *_args, **_kwargs) return val def RemoveTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_RemoveTool,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_RemoveTool(self, *_args, **_kwargs) return val def DeleteToolByPos(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_DeleteToolByPos,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_DeleteToolByPos(self, *_args, **_kwargs) return val def DeleteTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_DeleteTool,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_DeleteTool(self, *_args, **_kwargs) return val def ClearTools(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_ClearTools,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_ClearTools(self, *_args, **_kwargs) return val def Realize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_Realize,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_Realize(self, *_args, **_kwargs) return val def EnableTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_EnableTool,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_EnableTool(self, *_args, **_kwargs) return val def ToggleTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_ToggleTool,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_ToggleTool(self, *_args, **_kwargs) return val def SetToggle(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetToggle,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetToggle(self, *_args, **_kwargs) return val def GetToolClientData(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolClientData,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolClientData(self, *_args, **_kwargs) return val def SetToolClientData(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetToolClientData,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetToolClientData(self, *_args, **_kwargs) + return val + def GetToolPos(self, *_args, **_kwargs): + val = stattoolc.wxToolBarBase_GetToolPos(self, *_args, **_kwargs) return val def GetToolState(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolState,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolState(self, *_args, **_kwargs) return val def GetToolEnabled(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolEnabled,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolEnabled(self, *_args, **_kwargs) return val def SetToolShortHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetToolShortHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetToolShortHelp(self, *_args, **_kwargs) return val def GetToolShortHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolShortHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolShortHelp(self, *_args, **_kwargs) return val def SetToolLongHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetToolLongHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetToolLongHelp(self, *_args, **_kwargs) return val def GetToolLongHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolLongHelp,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolLongHelp(self, *_args, **_kwargs) return val def SetMarginsXY(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetMarginsXY,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetMarginsXY(self, *_args, **_kwargs) return val def SetMargins(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetMargins,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetMargins(self, *_args, **_kwargs) return val def SetToolPacking(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetToolPacking,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetToolPacking(self, *_args, **_kwargs) return val def SetToolSeparation(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetToolSeparation,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetToolSeparation(self, *_args, **_kwargs) return val def GetToolMargins(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolMargins,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolMargins(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetMargins(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetMargins,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetMargins(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetToolPacking(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolPacking,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolPacking(self, *_args, **_kwargs) return val def GetToolSeparation(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolSeparation,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolSeparation(self, *_args, **_kwargs) return val def SetRows(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetRows,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetRows(self, *_args, **_kwargs) return val def SetMaxRowsCols(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetMaxRowsCols,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetMaxRowsCols(self, *_args, **_kwargs) return val def GetMaxRows(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetMaxRows,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetMaxRows(self, *_args, **_kwargs) return val def GetMaxCols(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetMaxCols,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetMaxCols(self, *_args, **_kwargs) return val def SetToolBitmapSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_SetToolBitmapSize,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_SetToolBitmapSize(self, *_args, **_kwargs) return val def GetToolBitmapSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolBitmapSize,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolBitmapSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetToolSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_GetToolSize,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_GetToolSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def FindToolForPosition(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_FindToolForPosition,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_FindToolForPosition(self, *_args, **_kwargs) return val def IsVertical(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarBase_IsVertical,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarBase_IsVertical(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxToolBarBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) # These match the original Add methods for this class, kept for # backwards compatibility with versions < 2.3.3. @@ -452,23 +455,23 @@ class wxToolBarPtr(wxToolBarBasePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_Create,(self,) + _args, _kwargs) + val = stattoolc.wxToolBar_Create(self, *_args, **_kwargs) return val def FindToolForPosition(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs) + val = stattoolc.wxToolBar_FindToolForPosition(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxToolBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxToolBar(wxToolBarPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(stattoolc.new_wxToolBar,_args,_kwargs) + self.this = stattoolc.new_wxToolBar(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreToolBar(*_args,**_kwargs): - val = wxToolBarPtr(apply(stattoolc.new_wxPreToolBar,_args,_kwargs)) + val = wxToolBarPtr(stattoolc.new_wxPreToolBar(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -479,23 +482,23 @@ class wxToolBarSimplePtr(wxToolBarBasePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarSimple_Create,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarSimple_Create(self, *_args, **_kwargs) return val def FindToolForPosition(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarSimple_FindToolForPosition,(self,) + _args, _kwargs) + val = stattoolc.wxToolBarSimple_FindToolForPosition(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxToolBarSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxToolBarSimple(wxToolBarSimplePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(stattoolc.new_wxToolBarSimple,_args,_kwargs) + self.this = stattoolc.new_wxToolBarSimple(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreToolBarSimple(*_args,**_kwargs): - val = wxToolBarSimplePtr(apply(stattoolc.new_wxPreToolBarSimple,_args,_kwargs)) + val = wxToolBarSimplePtr(stattoolc.new_wxPreToolBarSimple(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -512,3 +515,14 @@ def wxPreToolBarSimple(*_args,**_kwargs): wxTOOL_STYLE_BUTTON = stattoolc.wxTOOL_STYLE_BUTTON wxTOOL_STYLE_SEPARATOR = stattoolc.wxTOOL_STYLE_SEPARATOR wxTOOL_STYLE_CONTROL = stattoolc.wxTOOL_STYLE_CONTROL +wxTB_HORIZONTAL = stattoolc.wxTB_HORIZONTAL +wxTB_VERTICAL = stattoolc.wxTB_VERTICAL +wxTB_3DBUTTONS = stattoolc.wxTB_3DBUTTONS +wxTB_FLAT = stattoolc.wxTB_FLAT +wxTB_DOCKABLE = stattoolc.wxTB_DOCKABLE +wxTB_NOICONS = stattoolc.wxTB_NOICONS +wxTB_TEXT = stattoolc.wxTB_TEXT +wxTB_NODIVIDER = stattoolc.wxTB_NODIVIDER +wxTB_NOALIGN = stattoolc.wxTB_NOALIGN +wxTB_HORZ_LAYOUT = stattoolc.wxTB_HORZ_LAYOUT +wxTB_HORZ_TEXT = stattoolc.wxTB_HORZ_TEXT diff --git a/wxPython/src/msw/streams.py b/wxPython/src/msw/streams.py index d2a8b18800..5104c86c7d 100644 --- a/wxPython/src/msw/streams.py +++ b/wxPython/src/msw/streams.py @@ -6,58 +6,58 @@ class wxInputStreamPtr : self.this = this self.thisown = 0 def close(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_close,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_close(self, *_args, **_kwargs) return val def flush(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_flush,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_flush(self, *_args, **_kwargs) return val def eof(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_eof,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_eof(self, *_args, **_kwargs) return val def read(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_read,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_read(self, *_args, **_kwargs) return val def readline(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_readline,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_readline(self, *_args, **_kwargs) return val def readlines(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_readlines,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_readlines(self, *_args, **_kwargs) return val def seek(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_seek,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_seek(self, *_args, **_kwargs) return val def tell(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_tell,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_tell(self, *_args, **_kwargs) return val def Peek(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_Peek,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_Peek(self, *_args, **_kwargs) return val def GetC(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_GetC,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_GetC(self, *_args, **_kwargs) return val def LastRead(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_LastRead,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_LastRead(self, *_args, **_kwargs) return val def CanRead(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_CanRead,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_CanRead(self, *_args, **_kwargs) return val def Eof(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_Eof,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_Eof(self, *_args, **_kwargs) return val def Ungetch(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_Ungetch,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_Ungetch(self, *_args, **_kwargs) return val def SeekI(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_SeekI,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_SeekI(self, *_args, **_kwargs) return val def TellI(self, *_args, **_kwargs): - val = apply(streamsc.wxInputStream_TellI,(self,) + _args, _kwargs) + val = streamsc.wxInputStream_TellI(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxInputStream instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxInputStream(wxInputStreamPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(streamsc.new_wxInputStream,_args,_kwargs) + self.this = streamsc.new_wxInputStream(*_args,**_kwargs) self.thisown = 1 @@ -68,10 +68,10 @@ class wxOutputStreamPtr : self.this = this self.thisown = 0 def write(self, *_args, **_kwargs): - val = apply(streamsc.wxOutputStream_write,(self,) + _args, _kwargs) + val = streamsc.wxOutputStream_write(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxOutputStream instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxOutputStream(wxOutputStreamPtr): def __init__(self,this): self.this = this diff --git a/wxPython/src/msw/utils.py b/wxPython/src/msw/utils.py index 5dc18f722d..c7c8da8ad2 100644 --- a/wxPython/src/msw/utils.py +++ b/wxPython/src/msw/utils.py @@ -17,118 +17,118 @@ class wxConfigBasePtr : except: pass def DeleteAll(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_DeleteAll,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_DeleteAll(self, *_args, **_kwargs) return val def DeleteEntry(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_DeleteEntry,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_DeleteEntry(self, *_args, **_kwargs) return val def DeleteGroup(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_DeleteGroup,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_DeleteGroup(self, *_args, **_kwargs) return val def Exists(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_Exists,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_Exists(self, *_args, **_kwargs) return val def Flush(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_Flush,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_Flush(self, *_args, **_kwargs) return val def GetAppName(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetAppName,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetAppName(self, *_args, **_kwargs) return val def GetFirstGroup(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetFirstGroup,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetFirstGroup(self, *_args, **_kwargs) return val def GetFirstEntry(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetFirstEntry,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetFirstEntry(self, *_args, **_kwargs) return val def GetNextGroup(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetNextGroup,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetNextGroup(self, *_args, **_kwargs) return val def GetNextEntry(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetNextEntry,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetNextEntry(self, *_args, **_kwargs) return val def GetNumberOfEntries(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetNumberOfEntries,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetNumberOfEntries(self, *_args, **_kwargs) return val def GetNumberOfGroups(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetNumberOfGroups,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetNumberOfGroups(self, *_args, **_kwargs) return val def GetPath(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetPath,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetPath(self, *_args, **_kwargs) return val def GetVendorName(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetVendorName,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetVendorName(self, *_args, **_kwargs) return val def HasEntry(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_HasEntry,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_HasEntry(self, *_args, **_kwargs) return val def HasGroup(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_HasGroup,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_HasGroup(self, *_args, **_kwargs) return val def IsExpandingEnvVars(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_IsExpandingEnvVars,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_IsExpandingEnvVars(self, *_args, **_kwargs) return val def IsRecordingDefaults(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_IsRecordingDefaults,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_IsRecordingDefaults(self, *_args, **_kwargs) return val def Read(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_Read,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_Read(self, *_args, **_kwargs) return val def ReadInt(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_ReadInt,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_ReadInt(self, *_args, **_kwargs) return val def ReadFloat(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_ReadFloat,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_ReadFloat(self, *_args, **_kwargs) return val def ReadBool(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_ReadBool,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_ReadBool(self, *_args, **_kwargs) return val def SetExpandEnvVars(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_SetExpandEnvVars,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_SetExpandEnvVars(self, *_args, **_kwargs) return val def SetPath(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_SetPath,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_SetPath(self, *_args, **_kwargs) return val def SetRecordDefaults(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_SetRecordDefaults,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_SetRecordDefaults(self, *_args, **_kwargs) return val def SetAppName(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_SetAppName,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_SetAppName(self, *_args, **_kwargs) return val def SetVendorName(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_SetVendorName,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_SetVendorName(self, *_args, **_kwargs) return val def SetStyle(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_SetStyle,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_SetStyle(self, *_args, **_kwargs) return val def GetStyle(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetStyle,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetStyle(self, *_args, **_kwargs) return val def Write(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_Write,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_Write(self, *_args, **_kwargs) return val def WriteInt(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_WriteInt,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_WriteInt(self, *_args, **_kwargs) return val def WriteFloat(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_WriteFloat,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_WriteFloat(self, *_args, **_kwargs) return val def WriteBool(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_WriteBool,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_WriteBool(self, *_args, **_kwargs) return val def GetEntryType(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_GetEntryType,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_GetEntryType(self, *_args, **_kwargs) return val def RenameEntry(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_RenameEntry,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_RenameEntry(self, *_args, **_kwargs) return val def RenameGroup(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_RenameGroup,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_RenameGroup(self, *_args, **_kwargs) return val def ExpandEnvVars(self, *_args, **_kwargs): - val = apply(utilsc.wxConfigBase_ExpandEnvVars,(self,) + _args, _kwargs) + val = utilsc.wxConfigBase_ExpandEnvVars(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxConfigBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxConfigBase(wxConfigBasePtr): def __init__(self,this): self.this = this @@ -147,10 +147,10 @@ class wxConfigPtr(wxConfigBasePtr): except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxConfig(wxConfigPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(utilsc.new_wxConfig,_args,_kwargs) + self.this = utilsc.new_wxConfig(*_args,**_kwargs) self.thisown = 1 @@ -167,10 +167,10 @@ class wxFileConfigPtr(wxConfigBasePtr): except: pass def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxFileConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxFileConfig(wxFileConfigPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(utilsc.new_wxFileConfig,_args,_kwargs) + self.this = utilsc.new_wxFileConfig(*_args,**_kwargs) self.thisown = 1 @@ -278,289 +278,289 @@ class wxDateTimePtr : except: pass def SetToCurrent(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToCurrent,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToCurrent(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetTimeT(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetTimeT,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetTimeT(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetJDN(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetJDN,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetJDN(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetHMS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetHMS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetHMS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def Set(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_Set,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_Set(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def ResetTime(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ResetTime,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ResetTime(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetYear(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetYear,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetYear(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetMonth(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetMonth,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetMonth(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetHour(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetHour,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetHour(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetMinute(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetMinute,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetMinute(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetSecond(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetSecond,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetSecond(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetMillisecond(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetMillisecond,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetMillisecond(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SetToWeekDayInSameWeek(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToWeekDayInSameWeek,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToWeekDayInSameWeek(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def GetWeekDayInSameWeek(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetWeekDayInSameWeek,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetWeekDayInSameWeek(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def SetToNextWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToNextWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToNextWeekDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def GetNextWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetNextWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetNextWeekDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def SetToPrevWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToPrevWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToPrevWeekDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def GetPrevWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetPrevWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetPrevWeekDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def SetToWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToWeekDay(self, *_args, **_kwargs) return val def SetToLastWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToLastWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToLastWeekDay(self, *_args, **_kwargs) return val def GetLastWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetLastWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetLastWeekDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def SetToTheWeek(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToTheWeek,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToTheWeek(self, *_args, **_kwargs) return val def GetWeek(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetWeek,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetWeek(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def SetToLastMonthDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToLastMonthDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToLastMonthDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def GetLastMonthDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetLastMonthDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetLastMonthDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def SetToYearDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SetToYearDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SetToYearDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def GetYearDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetYearDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetYearDay(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def GetJulianDayNumber(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetJulianDayNumber,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetJulianDayNumber(self, *_args, **_kwargs) return val def GetJDN(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetJDN,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetJDN(self, *_args, **_kwargs) return val def GetModifiedJulianDayNumber(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetModifiedJulianDayNumber,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetModifiedJulianDayNumber(self, *_args, **_kwargs) return val def GetMJD(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetMJD,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetMJD(self, *_args, **_kwargs) return val def GetRataDie(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetRataDie,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetRataDie(self, *_args, **_kwargs) return val def ToTimezone(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ToTimezone,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ToTimezone(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def MakeTimezone(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_MakeTimezone,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_MakeTimezone(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def ToGMT(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ToGMT,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ToGMT(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def MakeGMT(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_MakeGMT,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_MakeGMT(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def IsDST(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsDST,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsDST(self, *_args, **_kwargs) return val def IsValid(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsValid,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsValid(self, *_args, **_kwargs) return val def GetTicks(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetTicks,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetTicks(self, *_args, **_kwargs) return val def GetYear(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetYear,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetYear(self, *_args, **_kwargs) return val def GetMonth(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetMonth,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetMonth(self, *_args, **_kwargs) return val def GetDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetDay(self, *_args, **_kwargs) return val def GetWeekDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetWeekDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetWeekDay(self, *_args, **_kwargs) return val def GetHour(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetHour,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetHour(self, *_args, **_kwargs) return val def GetMinute(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetMinute,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetMinute(self, *_args, **_kwargs) return val def GetSecond(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetSecond,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetSecond(self, *_args, **_kwargs) return val def GetMillisecond(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetMillisecond,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetMillisecond(self, *_args, **_kwargs) return val def GetDayOfYear(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetDayOfYear,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetDayOfYear(self, *_args, **_kwargs) return val def GetWeekOfYear(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetWeekOfYear,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetWeekOfYear(self, *_args, **_kwargs) return val def GetWeekOfMonth(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetWeekOfMonth,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_GetWeekOfMonth(self, *_args, **_kwargs) return val def IsWorkDay(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsWorkDay,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsWorkDay(self, *_args, **_kwargs) return val def IsEqualTo(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsEqualTo,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsEqualTo(self, *_args, **_kwargs) return val def IsEarlierThan(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsEarlierThan,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsEarlierThan(self, *_args, **_kwargs) return val def IsLaterThan(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsLaterThan,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsLaterThan(self, *_args, **_kwargs) return val def IsStrictlyBetween(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsStrictlyBetween,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsStrictlyBetween(self, *_args, **_kwargs) return val def IsBetween(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsBetween,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsBetween(self, *_args, **_kwargs) return val def IsSameDate(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsSameDate,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsSameDate(self, *_args, **_kwargs) return val def IsSameTime(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsSameTime,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsSameTime(self, *_args, **_kwargs) return val def IsEqualUpTo(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_IsEqualUpTo,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_IsEqualUpTo(self, *_args, **_kwargs) return val def AddTS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_AddTS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_AddTS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def AddDS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_AddDS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_AddDS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SubtractTS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SubtractTS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SubtractTS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def SubtractDS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_SubtractDS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_SubtractDS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) return val def Subtract(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_Subtract,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_Subtract(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __add__TS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime___add__TS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime___add__TS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def __add__DS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime___add__DS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime___add__DS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def __sub__DT(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime___sub__DT,(self,) + _args, _kwargs) + val = utilsc.wxDateTime___sub__DT(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __sub__TS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime___sub__TS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime___sub__TS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def __sub__DS(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime___sub__DS,(self,) + _args, _kwargs) + val = utilsc.wxDateTime___sub__DS(self, *_args, **_kwargs) if val: val = wxDateTimePtr(val) ; val.thisown = 1 return val def __cmp__(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime___cmp__,(self,) + _args, _kwargs) + val = utilsc.wxDateTime___cmp__(self, *_args, **_kwargs) return val def ParseRfc822Date(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ParseRfc822Date,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ParseRfc822Date(self, *_args, **_kwargs) return val def ParseFormat(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ParseFormat,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ParseFormat(self, *_args, **_kwargs) return val def ParseDateTime(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ParseDateTime,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ParseDateTime(self, *_args, **_kwargs) return val def ParseDate(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ParseDate,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ParseDate(self, *_args, **_kwargs) return val def ParseTime(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_ParseTime,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_ParseTime(self, *_args, **_kwargs) return val def Format(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_Format,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_Format(self, *_args, **_kwargs) return val def FormatDate(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_FormatDate,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_FormatDate(self, *_args, **_kwargs) return val def FormatTime(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_FormatTime,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_FormatTime(self, *_args, **_kwargs) return val def FormatISODate(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_FormatISODate,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_FormatISODate(self, *_args, **_kwargs) return val def FormatISOTime(self, *_args, **_kwargs): - val = apply(utilsc.wxDateTime_FormatISOTime,(self,) + _args, _kwargs) + val = utilsc.wxDateTime_FormatISOTime(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDateTime instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) def __add__(self, other): if isinstance(other, wxTimeSpanPtr): @@ -585,28 +585,28 @@ class wxDateTimePtr : class wxDateTime(wxDateTimePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(utilsc.new_wxDateTime,_args,_kwargs) + self.this = utilsc.new_wxDateTime(*_args,**_kwargs) self.thisown = 1 def wxDateTimeFromTimeT(*_args,**_kwargs): - val = wxDateTimePtr(apply(utilsc.new_wxDateTimeFromTimeT,_args,_kwargs)) + val = wxDateTimePtr(utilsc.new_wxDateTimeFromTimeT(*_args,**_kwargs)) val.thisown = 1 return val def wxDateTimeFromJDN(*_args,**_kwargs): - val = wxDateTimePtr(apply(utilsc.new_wxDateTimeFromJDN,_args,_kwargs)) + val = wxDateTimePtr(utilsc.new_wxDateTimeFromJDN(*_args,**_kwargs)) val.thisown = 1 return val def wxDateTimeFromHMS(*_args,**_kwargs): - val = wxDateTimePtr(apply(utilsc.new_wxDateTimeFromHMS,_args,_kwargs)) + val = wxDateTimePtr(utilsc.new_wxDateTimeFromHMS(*_args,**_kwargs)) val.thisown = 1 return val def wxDateTimeFromDMY(*_args,**_kwargs): - val = wxDateTimePtr(apply(utilsc.new_wxDateTimeFromDMY,_args,_kwargs)) + val = wxDateTimePtr(utilsc.new_wxDateTimeFromDMY(*_args,**_kwargs)) val.thisown = 1 return val @@ -622,92 +622,92 @@ class wxTimeSpanPtr : except: pass def Add(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Add,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_Add(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) return val def Subtract(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Subtract,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_Subtract(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) return val def Multiply(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Multiply,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_Multiply(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) return val def Neg(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Neg,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_Neg(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) return val def Abs(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Abs,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_Abs(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __add__(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan___add__,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan___add__(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __sub__(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan___sub__,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan___sub__(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __mul__(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan___mul__,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan___mul__(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __rmul__(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan___rmul__,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan___rmul__(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __neg__(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan___neg__,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan___neg__(self, *_args, **_kwargs) if val: val = wxTimeSpanPtr(val) ; val.thisown = 1 return val def __cmp__(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan___cmp__,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan___cmp__(self, *_args, **_kwargs) return val def IsNull(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_IsNull,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_IsNull(self, *_args, **_kwargs) return val def IsPositive(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_IsPositive,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_IsPositive(self, *_args, **_kwargs) return val def IsNegative(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_IsNegative,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_IsNegative(self, *_args, **_kwargs) return val def IsEqualTo(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_IsEqualTo,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_IsEqualTo(self, *_args, **_kwargs) return val def IsLongerThan(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_IsLongerThan,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_IsLongerThan(self, *_args, **_kwargs) return val def IsShorterThan(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_IsShorterThan,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_IsShorterThan(self, *_args, **_kwargs) return val def GetWeeks(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_GetWeeks,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_GetWeeks(self, *_args, **_kwargs) return val def GetDays(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_GetDays,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_GetDays(self, *_args, **_kwargs) return val def GetHours(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_GetHours,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_GetHours(self, *_args, **_kwargs) return val def GetMinutes(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_GetMinutes,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_GetMinutes(self, *_args, **_kwargs) return val def GetSeconds(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_GetSeconds,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_GetSeconds(self, *_args, **_kwargs) return val def GetMilliseconds(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_GetMilliseconds,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_GetMilliseconds(self, *_args, **_kwargs) return val def Format(self, *_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Format,(self,) + _args, _kwargs) + val = utilsc.wxTimeSpan_Format(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTimeSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTimeSpan(wxTimeSpanPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(utilsc.new_wxTimeSpan,_args,_kwargs) + self.this = utilsc.new_wxTimeSpan(*_args,**_kwargs) self.thisown = 1 @@ -724,77 +724,77 @@ class wxDateSpanPtr : except: pass def SetYears(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_SetYears,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_SetYears(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def SetMonths(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_SetMonths,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_SetMonths(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def SetWeeks(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_SetWeeks,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_SetWeeks(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def SetDays(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_SetDays,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_SetDays(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def GetYears(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_GetYears,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_GetYears(self, *_args, **_kwargs) return val def GetMonths(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_GetMonths,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_GetMonths(self, *_args, **_kwargs) return val def GetWeeks(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_GetWeeks,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_GetWeeks(self, *_args, **_kwargs) return val def GetDays(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_GetDays,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_GetDays(self, *_args, **_kwargs) return val def GetTotalDays(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_GetTotalDays,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_GetTotalDays(self, *_args, **_kwargs) return val def Add(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Add,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_Add(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def Subtract(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Subtract,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_Subtract(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def Neg(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Neg,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_Neg(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def Multiply(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Multiply,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan_Multiply(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) return val def __add__(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan___add__,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan___add__(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) ; val.thisown = 1 return val def __sub__(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan___sub__,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan___sub__(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) ; val.thisown = 1 return val def __mul__(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan___mul__,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan___mul__(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) ; val.thisown = 1 return val def __rmul__(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan___rmul__,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan___rmul__(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) ; val.thisown = 1 return val def __neg__(self, *_args, **_kwargs): - val = apply(utilsc.wxDateSpan___neg__,(self,) + _args, _kwargs) + val = utilsc.wxDateSpan___neg__(self, *_args, **_kwargs) if val: val = wxDateSpanPtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxDateSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxDateSpan(wxDateSpanPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(utilsc.new_wxDateSpan,_args,_kwargs) + self.this = utilsc.new_wxDateSpan(*_args,**_kwargs) self.thisown = 1 @@ -813,17 +813,17 @@ wxGetCurrentTime = utilsc.wxGetCurrentTime wxGetLocalTimeMillis = utilsc.wxGetLocalTimeMillis def wxConfigBase_Set(*_args, **_kwargs): - val = apply(utilsc.wxConfigBase_Set,_args,_kwargs) + val = utilsc.wxConfigBase_Set(*_args,**_kwargs) if val: val = wxConfigBasePtr(val) return val def wxConfigBase_Get(*_args, **_kwargs): - val = apply(utilsc.wxConfigBase_Get,_args,_kwargs) + val = utilsc.wxConfigBase_Get(*_args,**_kwargs) if val: val = wxConfigBasePtr(val) return val def wxConfigBase_Create(*_args, **_kwargs): - val = apply(utilsc.wxConfigBase_Create,_args,_kwargs) + val = utilsc.wxConfigBase_Create(*_args,**_kwargs) if val: val = wxConfigBasePtr(val) return val @@ -858,117 +858,117 @@ wxDateTime_GetAmPmStrings = utilsc.wxDateTime_GetAmPmStrings wxDateTime_IsDSTApplicable = utilsc.wxDateTime_IsDSTApplicable def wxDateTime_GetBeginDST(*_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetBeginDST,_args,_kwargs) + val = utilsc.wxDateTime_GetBeginDST(*_args,**_kwargs) if val: val = wxDateTimePtr(val); val.thisown = 1 return val def wxDateTime_GetEndDST(*_args, **_kwargs): - val = apply(utilsc.wxDateTime_GetEndDST,_args,_kwargs) + val = utilsc.wxDateTime_GetEndDST(*_args,**_kwargs) if val: val = wxDateTimePtr(val); val.thisown = 1 return val def wxDateTime_Now(*_args, **_kwargs): - val = apply(utilsc.wxDateTime_Now,_args,_kwargs) + val = utilsc.wxDateTime_Now(*_args,**_kwargs) if val: val = wxDateTimePtr(val); val.thisown = 1 return val def wxDateTime_UNow(*_args, **_kwargs): - val = apply(utilsc.wxDateTime_UNow,_args,_kwargs) + val = utilsc.wxDateTime_UNow(*_args,**_kwargs) if val: val = wxDateTimePtr(val); val.thisown = 1 return val def wxDateTime_Today(*_args, **_kwargs): - val = apply(utilsc.wxDateTime_Today,_args,_kwargs) + val = utilsc.wxDateTime_Today(*_args,**_kwargs) if val: val = wxDateTimePtr(val); val.thisown = 1 return val def wxTimeSpan_Seconds(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Seconds,_args,_kwargs) + val = utilsc.wxTimeSpan_Seconds(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Second(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Second,_args,_kwargs) + val = utilsc.wxTimeSpan_Second(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Minutes(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Minutes,_args,_kwargs) + val = utilsc.wxTimeSpan_Minutes(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Minute(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Minute,_args,_kwargs) + val = utilsc.wxTimeSpan_Minute(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Hours(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Hours,_args,_kwargs) + val = utilsc.wxTimeSpan_Hours(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Hour(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Hour,_args,_kwargs) + val = utilsc.wxTimeSpan_Hour(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Days(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Days,_args,_kwargs) + val = utilsc.wxTimeSpan_Days(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Day(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Day,_args,_kwargs) + val = utilsc.wxTimeSpan_Day(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Weeks(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Weeks,_args,_kwargs) + val = utilsc.wxTimeSpan_Weeks(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxTimeSpan_Week(*_args, **_kwargs): - val = apply(utilsc.wxTimeSpan_Week,_args,_kwargs) + val = utilsc.wxTimeSpan_Week(*_args,**_kwargs) if val: val = wxTimeSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Days(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Days,_args,_kwargs) + val = utilsc.wxDateSpan_Days(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Day(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Day,_args,_kwargs) + val = utilsc.wxDateSpan_Day(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Weeks(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Weeks,_args,_kwargs) + val = utilsc.wxDateSpan_Weeks(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Week(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Week,_args,_kwargs) + val = utilsc.wxDateSpan_Week(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Months(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Months,_args,_kwargs) + val = utilsc.wxDateSpan_Months(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Month(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Month,_args,_kwargs) + val = utilsc.wxDateSpan_Month(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Years(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Years,_args,_kwargs) + val = utilsc.wxDateSpan_Years(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val def wxDateSpan_Year(*_args, **_kwargs): - val = apply(utilsc.wxDateSpan_Year,_args,_kwargs) + val = utilsc.wxDateSpan_Year(*_args,**_kwargs) if val: val = wxDateSpanPtr(val); val.thisown = 1 return val diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp index 7349a56836..902f34917c 100644 --- a/wxPython/src/msw/windows.cpp +++ b/wxPython/src/msw/windows.cpp @@ -1785,34 +1785,6 @@ static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *ar return _resultobj; } -#define wxWindow_GetBorder(_swigobj) (_swigobj->GetBorder()) -static PyObject *_wrap_wxWindow_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxBorder _result; - wxWindow * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetBorder",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetBorder. Expected _wxWindow_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxBorder )wxWindow_GetBorder(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static PyObject * wxWindow_GetChildren(wxWindow *self) { wxWindowList& list = self->GetChildren(); return wxPy_ConvertList(&list, "wxWindow"); @@ -5166,15 +5138,16 @@ static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *a return _resultobj; } -#define wxWindow_UpdateWindowUI(_swigobj) (_swigobj->UpdateWindowUI()) +#define wxWindow_UpdateWindowUI(_swigobj,_swigarg0) (_swigobj->UpdateWindowUI(_swigarg0)) static PyObject *_wrap_wxWindow_UpdateWindowUI(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxWindow * _arg0; + long _arg1 = (long ) wxUPDATE_UI_NONE; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","flags", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_UpdateWindowUI",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|l:wxWindow_UpdateWindowUI",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5185,7 +5158,7 @@ static PyObject *_wrap_wxWindow_UpdateWindowUI(PyObject *self, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxWindow_UpdateWindowUI(_arg0); + wxWindow_UpdateWindowUI(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -6463,6 +6436,78 @@ static PyObject *_wrap_wxWindow_GetAcceleratorTable(PyObject *self, PyObject *ar return _resultobj; } +static bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode) { +#if wxUSE_HOTKEY + return self->RegisterHotKey(hotkeyId, modifiers, keycode); +#else + return FALSE; +#endif + } +static PyObject *_wrap_wxWindow_RegisterHotKey(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + int _arg1; + int _arg2; + int _arg3; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","hotkeyId","modifiers","keycode", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxWindow_RegisterHotKey",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_RegisterHotKey. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxWindow_RegisterHotKey(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static bool wxWindow_UnregisterHotKey(wxWindow *self,int hotkeyId) { +#if wxUSE_HOTKEY + return self->UnregisterHotKey(hotkeyId); +#else + return FALSE; +#endif + } +static PyObject *_wrap_wxWindow_UnregisterHotKey(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","hotkeyId", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_UnregisterHotKey",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_UnregisterHotKey. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxWindow_UnregisterHotKey(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxWindow_OnPaint(_swigobj,_swigarg0) (_swigobj->OnPaint(_swigarg0)) static PyObject *_wrap_wxWindow_OnPaint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6733,6 +6778,122 @@ static PyObject *_wrap_wxWindow_HasCapture(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxWindow_SetThemeEnabled(_swigobj,_swigarg0) (_swigobj->SetThemeEnabled(_swigarg0)) +static PyObject *_wrap_wxWindow_SetThemeEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","enable", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_SetThemeEnabled",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetThemeEnabled. Expected _wxWindow_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxWindow_SetThemeEnabled(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxWindow_GetThemeEnabled(_swigobj) (_swigobj->GetThemeEnabled()) +static PyObject *_wrap_wxWindow_GetThemeEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetThemeEnabled",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetThemeEnabled. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxWindow_GetThemeEnabled(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxWindow_GetBorderFlags(_swigobj,_swigarg0) (_swigobj->GetBorder(_swigarg0)) +static PyObject *_wrap_wxWindow_GetBorderFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBorder _result; + wxWindow * _arg0; + long _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","flags", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxWindow_GetBorderFlags",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetBorderFlags. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxBorder )wxWindow_GetBorderFlags(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxWindow_GetBorder(_swigobj) (_swigobj->GetBorder()) +static PyObject *_wrap_wxWindow_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBorder _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetBorder",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetBorder. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxBorder )wxWindow_GetBorder(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxPanelTowxWindow(void *ptr) { wxPanel *src; wxWindow *dest; @@ -9000,6 +9161,35 @@ static PyObject *_wrap_wxMenu_FindItemById(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxMenu_FindItemByPosition(_swigobj,_swigarg0) (_swigobj->FindItemByPosition(_swigarg0)) +static PyObject *_wrap_wxMenu_FindItemByPosition(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _result; + wxMenu * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","position", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_FindItemByPosition",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItemByPosition. Expected _wxMenu_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxMenuItem *)wxMenu_FindItemByPosition(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + #define wxMenu_GetTitle(_swigobj) (_swigobj->GetTitle()) static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -10731,6 +10921,43 @@ static PyObject *_wrap_wxMenuItem_GetMenu(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxMenuItem_SetMenu(_swigobj,_swigarg0) (_swigobj->SetMenu(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetMenu(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxMenu * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","menu", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetMenu",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetMenu. Expected _wxMenuItem_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetMenu. Expected _wxMenu_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxMenuItem_SetMenu(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxMenuItem_SetId(_swigobj,_swigarg0) (_swigobj->SetId(_swigarg0)) static PyObject *_wrap_wxMenuItem_SetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -11919,6 +12146,7 @@ static PyMethodDef windowscMethods[] = { { "wxMenuItem_IsSeparator", (PyCFunction) _wrap_wxMenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetId", (PyCFunction) _wrap_wxMenuItem_GetId, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_SetId", (PyCFunction) _wrap_wxMenuItem_SetId, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetMenu", (PyCFunction) _wrap_wxMenuItem_SetMenu, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetMenu", (PyCFunction) _wrap_wxMenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS }, { "new_wxMenuItem", (PyCFunction) _wrap_new_wxMenuItem, METH_VARARGS | METH_KEYWORDS }, { "wxMenuBar_GetHelpString", (PyCFunction) _wrap_wxMenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS }, @@ -11967,6 +12195,7 @@ static PyMethodDef windowscMethods[] = { { "wxMenu_GetLabel", (PyCFunction) _wrap_wxMenu_GetLabel, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_SetTitle", (PyCFunction) _wrap_wxMenu_SetTitle, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_GetTitle", (PyCFunction) _wrap_wxMenu_GetTitle, METH_VARARGS | METH_KEYWORDS }, + { "wxMenu_FindItemByPosition", (PyCFunction) _wrap_wxMenu_FindItemByPosition, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_FindItemById", (PyCFunction) _wrap_wxMenu_FindItemById, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_FindItem", (PyCFunction) _wrap_wxMenu_FindItem, METH_VARARGS | METH_KEYWORDS }, { "wxMenu_IsEnabled", (PyCFunction) _wrap_wxMenu_IsEnabled, METH_VARARGS | METH_KEYWORDS }, @@ -12021,6 +12250,10 @@ static PyMethodDef windowscMethods[] = { { "wxPanel_Create", (PyCFunction) _wrap_wxPanel_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPrePanel", (PyCFunction) _wrap_new_wxPrePanel, METH_VARARGS | METH_KEYWORDS }, { "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_GetBorder", (PyCFunction) _wrap_wxWindow_GetBorder, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_GetBorderFlags", (PyCFunction) _wrap_wxWindow_GetBorderFlags, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_GetThemeEnabled", (PyCFunction) _wrap_wxWindow_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_SetThemeEnabled", (PyCFunction) _wrap_wxWindow_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_HasCapture", (PyCFunction) _wrap_wxWindow_HasCapture, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetCapture", (PyCFunction) _wrap_wxWindow_GetCapture, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_ReleaseMouse", (PyCFunction) _wrap_wxWindow_ReleaseMouse, METH_VARARGS | METH_KEYWORDS }, @@ -12030,6 +12263,8 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_SetDefaultItem", (PyCFunction) _wrap_wxWindow_SetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetDefaultItem", (PyCFunction) _wrap_wxWindow_GetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_OnPaint", (PyCFunction) _wrap_wxWindow_OnPaint, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_UnregisterHotKey", (PyCFunction) _wrap_wxWindow_UnregisterHotKey, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_RegisterHotKey", (PyCFunction) _wrap_wxWindow_RegisterHotKey, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetAcceleratorTable", (PyCFunction) _wrap_wxWindow_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_PrevControlId", (PyCFunction) _wrap_wxWindow_PrevControlId, METH_VARARGS | METH_KEYWORDS }, @@ -12171,7 +12406,6 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_GetCharWidth", (PyCFunction) _wrap_wxWindow_GetCharWidth, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetCharHeight", (PyCFunction) _wrap_wxWindow_GetCharHeight, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetChildren", (PyCFunction) _wrap_wxWindow_GetChildren, METH_VARARGS | METH_KEYWORDS }, - { "wxWindow_GetBorder", (PyCFunction) _wrap_wxWindow_GetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetBackgroundColour", (PyCFunction) _wrap_wxWindow_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_FitInside", (PyCFunction) _wrap_wxWindow_FitInside, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_Fit", (PyCFunction) _wrap_wxWindow_Fit, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index 39f7f50988..ac66decd78 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -27,43 +27,43 @@ class wxEvtHandlerPtr(wxObjectPtr): self.this = this self.thisown = 0 def ProcessEvent(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_ProcessEvent,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_ProcessEvent(self, *_args, **_kwargs) return val def AddPendingEvent(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_AddPendingEvent,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_AddPendingEvent(self, *_args, **_kwargs) return val def GetEvtHandlerEnabled(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_GetEvtHandlerEnabled,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_GetEvtHandlerEnabled(self, *_args, **_kwargs) return val def SetEvtHandlerEnabled(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_SetEvtHandlerEnabled,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_SetEvtHandlerEnabled(self, *_args, **_kwargs) return val def GetNextHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_GetNextHandler,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_GetNextHandler(self, *_args, **_kwargs) return val def GetPreviousHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_GetPreviousHandler(self, *_args, **_kwargs) return val def SetNextHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_SetNextHandler,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_SetNextHandler(self, *_args, **_kwargs) return val def SetPreviousHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_SetPreviousHandler,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_SetPreviousHandler(self, *_args, **_kwargs) return val def Connect(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_Connect,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_Connect(self, *_args, **_kwargs) return val def Disconnect(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler_Disconnect,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler_Disconnect(self, *_args, **_kwargs) return val def _setOORInfo(self, *_args, **_kwargs): - val = apply(windowsc.wxEvtHandler__setOORInfo,(self,) + _args, _kwargs) + val = windowsc.wxEvtHandler__setOORInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxEvtHandler(wxEvtHandlerPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxEvtHandler,_args,_kwargs) + self.this = windowsc.new_wxEvtHandler(*_args,**_kwargs) self.thisown = 1 @@ -74,19 +74,19 @@ class wxValidatorPtr(wxEvtHandlerPtr): self.this = this self.thisown = 0 def Clone(self, *_args, **_kwargs): - val = apply(windowsc.wxValidator_Clone,(self,) + _args, _kwargs) + val = windowsc.wxValidator_Clone(self, *_args, **_kwargs) return val def GetWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxValidator_GetWindow,(self,) + _args, _kwargs) + val = windowsc.wxValidator_GetWindow(self, *_args, **_kwargs) return val def SetWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxValidator_SetWindow,(self,) + _args, _kwargs) + val = windowsc.wxValidator_SetWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxValidator(wxValidatorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxValidator,_args,_kwargs) + self.this = windowsc.new_wxValidator(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -98,13 +98,13 @@ class wxPyValidatorPtr(wxValidatorPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(windowsc.wxPyValidator__setCallbackInfo,(self,) + _args, _kwargs) + val = windowsc.wxPyValidator__setCallbackInfo(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyValidator(wxPyValidatorPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxPyValidator,_args,_kwargs) + self.this = windowsc.new_wxPyValidator(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyValidator, 1) self._setOORInfo(self) @@ -117,557 +117,572 @@ class wxWindowPtr(wxEvtHandlerPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Create,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Create(self, *_args, **_kwargs) return val def Center(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Center,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Center(self, *_args, **_kwargs) return val def Centre(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Centre,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Centre(self, *_args, **_kwargs) return val def CentreOnParent(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_CentreOnParent,(self,) + _args, _kwargs) + val = windowsc.wxWindow_CentreOnParent(self, *_args, **_kwargs) return val def CenterOnParent(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_CenterOnParent,(self,) + _args, _kwargs) + val = windowsc.wxWindow_CenterOnParent(self, *_args, **_kwargs) return val def CentreOnScreen(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_CentreOnScreen,(self,) + _args, _kwargs) + val = windowsc.wxWindow_CentreOnScreen(self, *_args, **_kwargs) return val def CenterOnScreen(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_CenterOnScreen,(self,) + _args, _kwargs) + val = windowsc.wxWindow_CenterOnScreen(self, *_args, **_kwargs) return val def Clear(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Clear,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Clear(self, *_args, **_kwargs) return val def ClientToScreenXY(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ClientToScreenXY,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ClientToScreenXY(self, *_args, **_kwargs) return val def ClientToScreen(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ClientToScreen,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ClientToScreen(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def Close(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Close,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Close(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Destroy,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Destroy(self, *_args, **_kwargs) return val def DestroyChildren(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_DestroyChildren,(self,) + _args, _kwargs) + val = windowsc.wxWindow_DestroyChildren(self, *_args, **_kwargs) return val def IsBeingDeleted(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsBeingDeleted,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsBeingDeleted(self, *_args, **_kwargs) return val def DragAcceptFiles(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_DragAcceptFiles,(self,) + _args, _kwargs) + val = windowsc.wxWindow_DragAcceptFiles(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Enable,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Enable(self, *_args, **_kwargs) return val def Disable(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Disable,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Disable(self, *_args, **_kwargs) return val def FindWindowById(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_FindWindowById,(self,) + _args, _kwargs) + val = windowsc.wxWindow_FindWindowById(self, *_args, **_kwargs) return val def FindWindowByName(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_FindWindowByName,(self,) + _args, _kwargs) + val = windowsc.wxWindow_FindWindowByName(self, *_args, **_kwargs) return val def Fit(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Fit,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Fit(self, *_args, **_kwargs) return val def FitInside(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_FitInside,(self,) + _args, _kwargs) + val = windowsc.wxWindow_FitInside(self, *_args, **_kwargs) return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetBackgroundColour,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val - def GetBorder(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetBorder,(self,) + _args, _kwargs) - return val def GetChildren(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetChildren,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetChildren(self, *_args, **_kwargs) return val def GetCharHeight(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetCharHeight,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetCharHeight(self, *_args, **_kwargs) return val def GetCharWidth(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetCharWidth,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetCharWidth(self, *_args, **_kwargs) return val def GetClientSizeTuple(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetClientSizeTuple,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetClientSizeTuple(self, *_args, **_kwargs) return val def GetClientSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetClientSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetClientSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetClientAreaOrigin(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetClientAreaOrigin,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetClientAreaOrigin(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetClientRect(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetClientRect,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetClientRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def GetConstraints(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetConstraints(self, *_args, **_kwargs) if val: val = wxLayoutConstraintsPtr(val) return val def GetEventHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetEventHandler,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetEventHandler(self, *_args, **_kwargs) return val def GetFont(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetForegroundColour(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetForegroundColour,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetForegroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def GetGrandParent(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetGrandParent,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetGrandParent(self, *_args, **_kwargs) return val def GetHandle(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetHandle,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetHandle(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetId,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetId(self, *_args, **_kwargs) return val def GetLabel(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetLabel,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetLabel(self, *_args, **_kwargs) return val def SetLabel(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetLabel,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetLabel(self, *_args, **_kwargs) return val def GetName(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetName,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetName(self, *_args, **_kwargs) return val def GetParent(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetParent,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetParent(self, *_args, **_kwargs) return val def GetPositionTuple(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetPositionTuple,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetPositionTuple(self, *_args, **_kwargs) return val def GetPosition(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetPosition,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetPosition(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def GetRect(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetRect,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def GetScrollThumb(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetScrollThumb,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetScrollThumb(self, *_args, **_kwargs) return val def GetScrollPos(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetScrollPos,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetScrollPos(self, *_args, **_kwargs) return val def GetScrollRange(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetScrollRange,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetScrollRange(self, *_args, **_kwargs) return val def GetSizeTuple(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetSizeTuple,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetSizeTuple(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetTextExtent(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetTextExtent,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetTextExtent(self, *_args, **_kwargs) return val def GetFullTextExtent(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetFullTextExtent,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetFullTextExtent(self, *_args, **_kwargs) return val def GetTitle(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetTitle,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetTitle(self, *_args, **_kwargs) return val def GetUpdateRegion(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetUpdateRegion,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetUpdateRegion(self, *_args, **_kwargs) if val: val = wxRegionPtr(val) ; val.thisown = 1 return val def GetWindowStyleFlag(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetWindowStyleFlag,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetWindowStyleFlag(self, *_args, **_kwargs) return val def SetWindowStyleFlag(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetWindowStyleFlag,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetWindowStyleFlag(self, *_args, **_kwargs) return val def SetWindowStyle(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetWindowStyle,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetWindowStyle(self, *_args, **_kwargs) return val def HasScrollbar(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_HasScrollbar,(self,) + _args, _kwargs) + val = windowsc.wxWindow_HasScrollbar(self, *_args, **_kwargs) return val def Hide(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Hide,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Hide(self, *_args, **_kwargs) return val def HitTest(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_HitTest,(self,) + _args, _kwargs) + val = windowsc.wxWindow_HitTest(self, *_args, **_kwargs) return val def InitDialog(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_InitDialog,(self,) + _args, _kwargs) + val = windowsc.wxWindow_InitDialog(self, *_args, **_kwargs) return val def IsEnabled(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsEnabled,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsEnabled(self, *_args, **_kwargs) return val def IsExposed(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsExposed,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsExposed(self, *_args, **_kwargs) return val def IsExposedPoint(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsExposedPoint,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsExposedPoint(self, *_args, **_kwargs) return val def IsExposedRect(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsExposedRect,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsExposedRect(self, *_args, **_kwargs) return val def IsRetained(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsRetained,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsRetained(self, *_args, **_kwargs) return val def IsShown(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsShown,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsShown(self, *_args, **_kwargs) return val def IsTopLevel(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_IsTopLevel,(self,) + _args, _kwargs) + val = windowsc.wxWindow_IsTopLevel(self, *_args, **_kwargs) return val def Layout(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Layout,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Layout(self, *_args, **_kwargs) return val def Lower(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Lower,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Lower(self, *_args, **_kwargs) return val def MakeModal(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_MakeModal,(self,) + _args, _kwargs) + val = windowsc.wxWindow_MakeModal(self, *_args, **_kwargs) return val def MoveXY(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_MoveXY,(self,) + _args, _kwargs) + val = windowsc.wxWindow_MoveXY(self, *_args, **_kwargs) return val def Move(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Move,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Move(self, *_args, **_kwargs) return val def PopEventHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_PopEventHandler,(self,) + _args, _kwargs) + val = windowsc.wxWindow_PopEventHandler(self, *_args, **_kwargs) return val def PushEventHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs) + val = windowsc.wxWindow_PushEventHandler(self, *_args, **_kwargs) return val def RemoveEventHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_RemoveEventHandler,(self,) + _args, _kwargs) + val = windowsc.wxWindow_RemoveEventHandler(self, *_args, **_kwargs) return val def PopupMenuXY(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs) + val = windowsc.wxWindow_PopupMenuXY(self, *_args, **_kwargs) return val def PopupMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_PopupMenu,(self,) + _args, _kwargs) + val = windowsc.wxWindow_PopupMenu(self, *_args, **_kwargs) return val def Raise(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Raise,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Raise(self, *_args, **_kwargs) return val def Refresh(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Refresh,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Refresh(self, *_args, **_kwargs) return val def RefreshRect(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_RefreshRect,(self,) + _args, _kwargs) + val = windowsc.wxWindow_RefreshRect(self, *_args, **_kwargs) return val def AddChild(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_AddChild,(self,) + _args, _kwargs) + val = windowsc.wxWindow_AddChild(self, *_args, **_kwargs) return val def RemoveChild(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_RemoveChild,(self,) + _args, _kwargs) + val = windowsc.wxWindow_RemoveChild(self, *_args, **_kwargs) return val def Reparent(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Reparent,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Reparent(self, *_args, **_kwargs) return val def ScreenToClientXY(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ScreenToClientXY,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ScreenToClientXY(self, *_args, **_kwargs) return val def ScreenToClient(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ScreenToClient,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ScreenToClient(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def ScrollWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ScrollWindow(self, *_args, **_kwargs) return val def SetAutoLayout(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetAutoLayout(self, *_args, **_kwargs) return val def GetAutoLayout(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetAutoLayout,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetAutoLayout(self, *_args, **_kwargs) return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetBackgroundColour,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetBackgroundColour(self, *_args, **_kwargs) return val def SetConstraints(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetConstraints,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetConstraints(self, *_args, **_kwargs) return val def UnsetConstraints(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_UnsetConstraints,(self,) + _args, _kwargs) + val = windowsc.wxWindow_UnsetConstraints(self, *_args, **_kwargs) return val def SetFocus(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetFocus,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetFocus(self, *_args, **_kwargs) return val def SetFocusFromKbd(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetFocusFromKbd,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetFocusFromKbd(self, *_args, **_kwargs) return val def AcceptsFocus(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_AcceptsFocus,(self,) + _args, _kwargs) + val = windowsc.wxWindow_AcceptsFocus(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetFont,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetFont(self, *_args, **_kwargs) return val def SetForegroundColour(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetForegroundColour,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetForegroundColour(self, *_args, **_kwargs) return val def SetId(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetId,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetId(self, *_args, **_kwargs) return val def SetName(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetName,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetName(self, *_args, **_kwargs) return val def SetScrollbar(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetScrollbar,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetScrollbar(self, *_args, **_kwargs) return val def SetScrollPos(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetScrollPos,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetScrollPos(self, *_args, **_kwargs) return val def SetDimensions(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetDimensions,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetDimensions(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetSize(self, *_args, **_kwargs) return val def SetPosition(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetPosition,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetPosition(self, *_args, **_kwargs) return val def SetRect(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetRect,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetRect(self, *_args, **_kwargs) return val def SetSizeHints(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetSizeHints,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetSizeHints(self, *_args, **_kwargs) return val def SetVirtualSizeHints(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetVirtualSizeHints,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetVirtualSizeHints(self, *_args, **_kwargs) return val def SetVirtualSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetVirtualSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetVirtualSize(self, *_args, **_kwargs) return val def SetVirtualSizeWH(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetVirtualSizeWH,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetVirtualSizeWH(self, *_args, **_kwargs) return val def GetVirtualSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetVirtualSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetVirtualSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetVirtualSizeTuple(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetVirtualSizeTuple,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetVirtualSizeTuple(self, *_args, **_kwargs) return val def GetBestVirtualSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetBestVirtualSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetBestVirtualSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetClientSizeWH(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetClientSizeWH,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetClientSizeWH(self, *_args, **_kwargs) return val def SetClientSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetClientSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetClientSize(self, *_args, **_kwargs) return val def SetCursor(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetCursor,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetCursor(self, *_args, **_kwargs) return val def GetCursor(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetCursor,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetCursor(self, *_args, **_kwargs) if val: val = wxCursorPtr(val) return val def SetEventHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetEventHandler,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetEventHandler(self, *_args, **_kwargs) return val def SetExtraStyle(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetExtraStyle,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetExtraStyle(self, *_args, **_kwargs) return val def SetTitle(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetTitle,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetTitle(self, *_args, **_kwargs) return val def Show(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Show,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Show(self, *_args, **_kwargs) return val def TransferDataFromWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_TransferDataFromWindow,(self,) + _args, _kwargs) + val = windowsc.wxWindow_TransferDataFromWindow(self, *_args, **_kwargs) return val def TransferDataToWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_TransferDataToWindow,(self,) + _args, _kwargs) + val = windowsc.wxWindow_TransferDataToWindow(self, *_args, **_kwargs) return val def UpdateWindowUI(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_UpdateWindowUI,(self,) + _args, _kwargs) + val = windowsc.wxWindow_UpdateWindowUI(self, *_args, **_kwargs) return val def Validate(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Validate,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Validate(self, *_args, **_kwargs) return val def ConvertDialogPointToPixels(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ConvertDialogPointToPixels,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ConvertDialogPointToPixels(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def ConvertDialogSizeToPixels(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ConvertDialogSizeToPixels,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ConvertDialogSizeToPixels(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def DLG_PNT(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_DLG_PNT,(self,) + _args, _kwargs) + val = windowsc.wxWindow_DLG_PNT(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def DLG_SZE(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_DLG_SZE,(self,) + _args, _kwargs) + val = windowsc.wxWindow_DLG_SZE(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def ConvertPixelPointToDialog(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ConvertPixelPointToDialog,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ConvertPixelPointToDialog(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def ConvertPixelSizeToDialog(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ConvertPixelSizeToDialog,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ConvertPixelSizeToDialog(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetToolTipString(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetToolTipString,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetToolTipString(self, *_args, **_kwargs) return val def SetToolTip(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetToolTip,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetToolTip(self, *_args, **_kwargs) return val def GetToolTip(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetToolTip(self, *_args, **_kwargs) return val def SetSizer(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetSizer,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetSizer(self, *_args, **_kwargs) return val def SetSizerAndFit(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetSizerAndFit,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetSizerAndFit(self, *_args, **_kwargs) return val def GetSizer(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetSizer(self, *_args, **_kwargs) return val def SetContainingSizer(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetContainingSizer,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetContainingSizer(self, *_args, **_kwargs) return val def GetContainingSizer(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetContainingSizer,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetContainingSizer(self, *_args, **_kwargs) return val def GetValidator(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetValidator,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetValidator(self, *_args, **_kwargs) return val def SetValidator(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetValidator,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetValidator(self, *_args, **_kwargs) return val def SetDropTarget(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetDropTarget,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetDropTarget(self, *_args, **_kwargs) _args[0].thisown = 0 return val def GetDropTarget(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetDropTarget,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetDropTarget(self, *_args, **_kwargs) if val: val = wxDropTargetPtr(val) return val def GetBestSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetBestSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetBestSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetMaxSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetMaxSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetMaxSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetAdjustedBestSize(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetAdjustedBestSize,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetAdjustedBestSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetCaret(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetCaret,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetCaret(self, *_args, **_kwargs) return val def GetCaret(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetCaret(self, *_args, **_kwargs) if val: val = wxCaretPtr(val) return val def Freeze(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Freeze,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Freeze(self, *_args, **_kwargs) return val def Thaw(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Thaw,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Thaw(self, *_args, **_kwargs) return val def Update(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_Update,(self,) + _args, _kwargs) + val = windowsc.wxWindow_Update(self, *_args, **_kwargs) return val def GetHelpText(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetHelpText,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetHelpText(self, *_args, **_kwargs) return val def SetHelpText(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetHelpText,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetHelpText(self, *_args, **_kwargs) return val def SetHelpTextForId(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetHelpTextForId,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetHelpTextForId(self, *_args, **_kwargs) return val def ScrollLines(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ScrollLines,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ScrollLines(self, *_args, **_kwargs) return val def ScrollPages(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ScrollPages,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ScrollPages(self, *_args, **_kwargs) return val def LineUp(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_LineUp,(self,) + _args, _kwargs) + val = windowsc.wxWindow_LineUp(self, *_args, **_kwargs) return val def LineDown(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_LineDown,(self,) + _args, _kwargs) + val = windowsc.wxWindow_LineDown(self, *_args, **_kwargs) return val def PageUp(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_PageUp,(self,) + _args, _kwargs) + val = windowsc.wxWindow_PageUp(self, *_args, **_kwargs) return val def PageDown(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_PageDown,(self,) + _args, _kwargs) + val = windowsc.wxWindow_PageDown(self, *_args, **_kwargs) return val def SetAcceleratorTable(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetAcceleratorTable(self, *_args, **_kwargs) return val def GetAcceleratorTable(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetAcceleratorTable,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetAcceleratorTable(self, *_args, **_kwargs) if val: val = wxAcceleratorTablePtr(val) return val + def RegisterHotKey(self, *_args, **_kwargs): + val = windowsc.wxWindow_RegisterHotKey(self, *_args, **_kwargs) + return val + def UnregisterHotKey(self, *_args, **_kwargs): + val = windowsc.wxWindow_UnregisterHotKey(self, *_args, **_kwargs) + return val def OnPaint(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_OnPaint,(self,) + _args, _kwargs) + val = windowsc.wxWindow_OnPaint(self, *_args, **_kwargs) return val def GetDefaultItem(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_GetDefaultItem,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetDefaultItem(self, *_args, **_kwargs) return val def SetDefaultItem(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetDefaultItem,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetDefaultItem(self, *_args, **_kwargs) return val def SetTmpDefaultItem(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetTmpDefaultItem,(self,) + _args, _kwargs) + val = windowsc.wxWindow_SetTmpDefaultItem(self, *_args, **_kwargs) return val def WarpPointer(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_WarpPointer,(self,) + _args, _kwargs) + val = windowsc.wxWindow_WarpPointer(self, *_args, **_kwargs) return val def CaptureMouse(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_CaptureMouse,(self,) + _args, _kwargs) + val = windowsc.wxWindow_CaptureMouse(self, *_args, **_kwargs) return val def ReleaseMouse(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_ReleaseMouse,(self,) + _args, _kwargs) + val = windowsc.wxWindow_ReleaseMouse(self, *_args, **_kwargs) return val def HasCapture(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_HasCapture,(self,) + _args, _kwargs) + val = windowsc.wxWindow_HasCapture(self, *_args, **_kwargs) + return val + def SetThemeEnabled(self, *_args, **_kwargs): + val = windowsc.wxWindow_SetThemeEnabled(self, *_args, **_kwargs) + return val + def GetThemeEnabled(self, *_args, **_kwargs): + val = windowsc.wxWindow_GetThemeEnabled(self, *_args, **_kwargs) + return val + def GetBorderFlags(self, *_args, **_kwargs): + val = windowsc.wxWindow_GetBorderFlags(self, *_args, **_kwargs) + return val + def GetBorder(self, *_args, **_kwargs): + val = windowsc.wxWindow_GetBorder(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) # replaces broken shadow method def GetCaret(self, *_args, **_kwargs): from misc2 import wxCaretPtr - val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs) + val = windowsc.wxWindow_GetCaret(self, *_args, **_kwargs) if val: val = wxCaretPtr(val) return val class wxWindow(wxWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxWindow,_args,_kwargs) + self.this = windowsc.new_wxWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreWindow(*_args,**_kwargs): - val = wxWindowPtr(apply(windowsc.new_wxPreWindow,_args,_kwargs)) + val = wxWindowPtr(windowsc.new_wxPreWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -678,23 +693,23 @@ class wxPanelPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windowsc.wxPanel_Create,(self,) + _args, _kwargs) + val = windowsc.wxPanel_Create(self, *_args, **_kwargs) return val def InitDialog(self, *_args, **_kwargs): - val = apply(windowsc.wxPanel_InitDialog,(self,) + _args, _kwargs) + val = windowsc.wxPanel_InitDialog(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPanel(wxPanelPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxPanel,_args,_kwargs) + self.this = windowsc.new_wxPanel(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPrePanel(*_args,**_kwargs): - val = wxPanelPtr(apply(windowsc.new_wxPrePanel,_args,_kwargs)) + val = wxPanelPtr(windowsc.new_wxPrePanel(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -705,103 +720,103 @@ class wxScrolledWindowPtr(wxPanelPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_Create,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_Create(self, *_args, **_kwargs) return val def EnableScrolling(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_EnableScrolling,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_EnableScrolling(self, *_args, **_kwargs) return val def GetScrollPageSize(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_GetScrollPageSize,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_GetScrollPageSize(self, *_args, **_kwargs) return val def GetScrollPixelsPerUnit(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_GetScrollPixelsPerUnit,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_GetScrollPixelsPerUnit(self, *_args, **_kwargs) return val def GetTargetWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_GetTargetWindow,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_GetTargetWindow(self, *_args, **_kwargs) return val def IsRetained(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_IsRetained,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_IsRetained(self, *_args, **_kwargs) return val def PrepareDC(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_PrepareDC,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_PrepareDC(self, *_args, **_kwargs) return val def Scroll(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_Scroll,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_Scroll(self, *_args, **_kwargs) return val def SetScrollbars(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_SetScrollbars,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_SetScrollbars(self, *_args, **_kwargs) return val def SetScrollPageSize(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_SetScrollPageSize,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_SetScrollPageSize(self, *_args, **_kwargs) return val def SetTargetWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_SetTargetWindow,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_SetTargetWindow(self, *_args, **_kwargs) return val def GetViewStart(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_GetViewStart,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_GetViewStart(self, *_args, **_kwargs) return val def CalcScrolledPosition1(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_CalcScrolledPosition1,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_CalcScrolledPosition1(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def CalcScrolledPosition2(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_CalcScrolledPosition2,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_CalcScrolledPosition2(self, *_args, **_kwargs) return val def CalcUnscrolledPosition1(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_CalcUnscrolledPosition1,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_CalcUnscrolledPosition1(self, *_args, **_kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val def CalcUnscrolledPosition2(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_CalcUnscrolledPosition2,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_CalcUnscrolledPosition2(self, *_args, **_kwargs) return val def SetScale(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_SetScale,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_SetScale(self, *_args, **_kwargs) return val def GetScaleX(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_GetScaleX,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_GetScaleX(self, *_args, **_kwargs) return val def GetScaleY(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_GetScaleY,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_GetScaleY(self, *_args, **_kwargs) return val def AdjustScrollbars(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_AdjustScrollbars,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_AdjustScrollbars(self, *_args, **_kwargs) return val def Layout(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_Layout,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_Layout(self, *_args, **_kwargs) return val def SetScrollRate(self, *_args, **_kwargs): - val = apply(windowsc.wxScrolledWindow_SetScrollRate,(self,) + _args, _kwargs) + val = windowsc.wxScrolledWindow_SetScrollRate(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) ViewStart = GetViewStart def CalcScrolledPosition(self, *args): if len(args) == 1: - return apply(self.CalcScrolledPosition1, args) + return self.CalcScrolledPosition1(*args) elif len(args) == 2: - return apply(self.CalcScrolledPosition2, args) + return self.CalcScrolledPosition2(*args) else: raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed' def CalcUnscrolledPosition(self, *args): if len(args) == 1: - return apply(self.CalcUnscrolledPosition1, args) + return self.CalcUnscrolledPosition1(*args) elif len(args) == 2: - return apply(self.CalcUnscrolledPosition2, args) + return self.CalcUnscrolledPosition2(*args) else: raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed' class wxScrolledWindow(wxScrolledWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxScrolledWindow,_args,_kwargs) + self.this = windowsc.new_wxScrolledWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreScrolledWindow(*_args,**_kwargs): - val = wxScrolledWindowPtr(apply(windowsc.new_wxPreScrolledWindow,_args,_kwargs)) + val = wxScrolledWindowPtr(windowsc.new_wxPreScrolledWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -812,157 +827,160 @@ class wxMenuPtr(wxEvtHandlerPtr): self.this = this self.thisown = 0 def Append(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Append,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Append(self, *_args, **_kwargs) return val def AppendMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_AppendMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenu_AppendMenu(self, *_args, **_kwargs) return val def AppendItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_AppendItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_AppendItem(self, *_args, **_kwargs) return val def AppendCheckItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_AppendCheckItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_AppendCheckItem(self, *_args, **_kwargs) return val def AppendRadioItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_AppendRadioItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_AppendRadioItem(self, *_args, **_kwargs) return val def AppendSeparator(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_AppendSeparator,(self,) + _args, _kwargs) + val = windowsc.wxMenu_AppendSeparator(self, *_args, **_kwargs) return val def Insert(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Insert,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Insert(self, *_args, **_kwargs) return val def InsertSeparator(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_InsertSeparator,(self,) + _args, _kwargs) + val = windowsc.wxMenu_InsertSeparator(self, *_args, **_kwargs) return val def InsertCheckItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_InsertCheckItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_InsertCheckItem(self, *_args, **_kwargs) return val def InsertRadioItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_InsertRadioItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_InsertRadioItem(self, *_args, **_kwargs) return val def InsertMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_InsertMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenu_InsertMenu(self, *_args, **_kwargs) return val def InsertItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_InsertItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_InsertItem(self, *_args, **_kwargs) return val def Prepend(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Prepend,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Prepend(self, *_args, **_kwargs) return val def PrependSeparator(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_PrependSeparator,(self,) + _args, _kwargs) + val = windowsc.wxMenu_PrependSeparator(self, *_args, **_kwargs) return val def PrependCheckItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_PrependCheckItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_PrependCheckItem(self, *_args, **_kwargs) return val def PrependRadioItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_PrependRadioItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_PrependRadioItem(self, *_args, **_kwargs) return val def PrependMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_PrependMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenu_PrependMenu(self, *_args, **_kwargs) return val def PrependItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_PrependItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_PrependItem(self, *_args, **_kwargs) return val def Break(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Break,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Break(self, *_args, **_kwargs) return val def Check(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Check,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Check(self, *_args, **_kwargs) return val def IsChecked(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_IsChecked,(self,) + _args, _kwargs) + val = windowsc.wxMenu_IsChecked(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Enable,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Enable(self, *_args, **_kwargs) return val def IsEnabled(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_IsEnabled,(self,) + _args, _kwargs) + val = windowsc.wxMenu_IsEnabled(self, *_args, **_kwargs) return val def FindItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_FindItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_FindItem(self, *_args, **_kwargs) return val def FindItemById(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_FindItemById,(self,) + _args, _kwargs) + val = windowsc.wxMenu_FindItemById(self, *_args, **_kwargs) + return val + def FindItemByPosition(self, *_args, **_kwargs): + val = windowsc.wxMenu_FindItemByPosition(self, *_args, **_kwargs) return val def GetTitle(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetTitle,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetTitle(self, *_args, **_kwargs) return val def SetTitle(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_SetTitle,(self,) + _args, _kwargs) + val = windowsc.wxMenu_SetTitle(self, *_args, **_kwargs) return val def GetLabel(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetLabel,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetLabel(self, *_args, **_kwargs) return val def SetLabel(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_SetLabel,(self,) + _args, _kwargs) + val = windowsc.wxMenu_SetLabel(self, *_args, **_kwargs) return val def GetHelpString(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetHelpString,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetHelpString(self, *_args, **_kwargs) return val def SetHelpString(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_SetHelpString,(self,) + _args, _kwargs) + val = windowsc.wxMenu_SetHelpString(self, *_args, **_kwargs) return val def UpdateUI(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_UpdateUI,(self,) + _args, _kwargs) + val = windowsc.wxMenu_UpdateUI(self, *_args, **_kwargs) return val def Delete(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Delete,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Delete(self, *_args, **_kwargs) return val def DeleteItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_DeleteItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_DeleteItem(self, *_args, **_kwargs) return val def Remove(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Remove,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Remove(self, *_args, **_kwargs) return val def RemoveItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_RemoveItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_RemoveItem(self, *_args, **_kwargs) return val def Destroy(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_Destroy,(self,) + _args, _kwargs) + val = windowsc.wxMenu_Destroy(self, *_args, **_kwargs) return val def DestroyId(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_DestroyId,(self,) + _args, _kwargs) + val = windowsc.wxMenu_DestroyId(self, *_args, **_kwargs) return val def DestroyItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_DestroyItem,(self,) + _args, _kwargs) + val = windowsc.wxMenu_DestroyItem(self, *_args, **_kwargs) return val def GetMenuItemCount(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetMenuItemCount,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetMenuItemCount(self, *_args, **_kwargs) return val def GetMenuItems(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetMenuItems,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetMenuItems(self, *_args, **_kwargs) return val def SetEventHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_SetEventHandler,(self,) + _args, _kwargs) + val = windowsc.wxMenu_SetEventHandler(self, *_args, **_kwargs) return val def GetEventHandler(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetEventHandler,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetEventHandler(self, *_args, **_kwargs) return val def SetInvokingWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_SetInvokingWindow,(self,) + _args, _kwargs) + val = windowsc.wxMenu_SetInvokingWindow(self, *_args, **_kwargs) return val def GetInvokingWindow(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetInvokingWindow,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetInvokingWindow(self, *_args, **_kwargs) return val def GetStyle(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetStyle,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetStyle(self, *_args, **_kwargs) return val def IsAttached(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_IsAttached,(self,) + _args, _kwargs) + val = windowsc.wxMenu_IsAttached(self, *_args, **_kwargs) return val def SetParent(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_SetParent,(self,) + _args, _kwargs) + val = windowsc.wxMenu_SetParent(self, *_args, **_kwargs) return val def GetParent(self, *_args, **_kwargs): - val = apply(windowsc.wxMenu_GetParent,(self,) + _args, _kwargs) + val = windowsc.wxMenu_GetParent(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMenu instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMenu(wxMenuPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxMenu,_args,_kwargs) + self.this = windowsc.new_wxMenu(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -974,73 +992,73 @@ class wxMenuBarPtr(wxWindowPtr): self.this = this self.thisown = 0 def Append(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_Append,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_Append(self, *_args, **_kwargs) return val def Insert(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_Insert,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_Insert(self, *_args, **_kwargs) return val def GetMenuCount(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_GetMenuCount,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_GetMenuCount(self, *_args, **_kwargs) return val def GetMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_GetMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_GetMenu(self, *_args, **_kwargs) return val def Replace(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_Replace,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_Replace(self, *_args, **_kwargs) return val def Remove(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_Remove,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_Remove(self, *_args, **_kwargs) return val def EnableTop(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_EnableTop,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_EnableTop(self, *_args, **_kwargs) return val def IsEnabledTop(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_IsEnabledTop,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_IsEnabledTop(self, *_args, **_kwargs) return val def SetLabelTop(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_SetLabelTop,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_SetLabelTop(self, *_args, **_kwargs) return val def GetLabelTop(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_GetLabelTop,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_GetLabelTop(self, *_args, **_kwargs) return val def FindMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_FindMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_FindMenu(self, *_args, **_kwargs) return val def FindMenuItem(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_FindMenuItem,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_FindMenuItem(self, *_args, **_kwargs) return val def FindItemById(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_FindItemById,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_FindItemById(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_Enable,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_Enable(self, *_args, **_kwargs) return val def Check(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_Check,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_Check(self, *_args, **_kwargs) return val def IsChecked(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_IsChecked,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_IsChecked(self, *_args, **_kwargs) return val def IsEnabled(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_IsEnabled,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_IsEnabled(self, *_args, **_kwargs) return val def SetLabel(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_SetLabel,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_SetLabel(self, *_args, **_kwargs) return val def GetLabel(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_GetLabel,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_GetLabel(self, *_args, **_kwargs) return val def SetHelpString(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_SetHelpString,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_SetHelpString(self, *_args, **_kwargs) return val def GetHelpString(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuBar_GetHelpString,(self,) + _args, _kwargs) + val = windowsc.wxMenuBar_GetHelpString(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMenuBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMenuBar(wxMenuBarPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxMenuBar,_args,_kwargs) + self.this = windowsc.new_wxMenuBar(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) @@ -1052,120 +1070,123 @@ class wxMenuItemPtr(wxObjectPtr): self.this = this self.thisown = 0 def GetMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetMenu(self, *_args, **_kwargs) + return val + def SetMenu(self, *_args, **_kwargs): + val = windowsc.wxMenuItem_SetMenu(self, *_args, **_kwargs) return val def SetId(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetId,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetId(self, *_args, **_kwargs) return val def GetId(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetId,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetId(self, *_args, **_kwargs) return val def IsSeparator(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_IsSeparator,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_IsSeparator(self, *_args, **_kwargs) return val def SetText(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetText,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetText(self, *_args, **_kwargs) return val def GetLabel(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetLabel,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetLabel(self, *_args, **_kwargs) return val def GetText(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetText,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetText(self, *_args, **_kwargs) return val def GetKind(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetKind,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetKind(self, *_args, **_kwargs) return val def SetCheckable(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetCheckable,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetCheckable(self, *_args, **_kwargs) return val def IsCheckable(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_IsCheckable,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_IsCheckable(self, *_args, **_kwargs) return val def IsSubMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_IsSubMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_IsSubMenu(self, *_args, **_kwargs) return val def SetSubMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetSubMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetSubMenu(self, *_args, **_kwargs) return val def GetSubMenu(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetSubMenu,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetSubMenu(self, *_args, **_kwargs) return val def Enable(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_Enable,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_Enable(self, *_args, **_kwargs) return val def IsEnabled(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_IsEnabled,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_IsEnabled(self, *_args, **_kwargs) return val def Check(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_Check,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_Check(self, *_args, **_kwargs) return val def IsChecked(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_IsChecked,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_IsChecked(self, *_args, **_kwargs) return val def Toggle(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_Toggle,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_Toggle(self, *_args, **_kwargs) return val def SetHelp(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetHelp,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetHelp(self, *_args, **_kwargs) return val def GetHelp(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetHelp,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetHelp(self, *_args, **_kwargs) return val def GetAccel(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetAccel,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetAccel(self, *_args, **_kwargs) if val: val = wxAcceleratorEntryPtr(val) return val def SetAccel(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetAccel,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetAccel(self, *_args, **_kwargs) return val def SetFont(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetFont,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetFont(self, *_args, **_kwargs) return val def GetFont(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetFont,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetFont(self, *_args, **_kwargs) if val: val = wxFontPtr(val) ; val.thisown = 1 return val def SetTextColour(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetTextColour,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetTextColour(self, *_args, **_kwargs) return val def GetTextColour(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetTextColour,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetTextColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetBackgroundColour(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetBackgroundColour,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetBackgroundColour(self, *_args, **_kwargs) return val def GetBackgroundColour(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetBackgroundColour,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetBackgroundColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) ; val.thisown = 1 return val def SetBitmaps(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetBitmaps,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetBitmaps(self, *_args, **_kwargs) return val def SetMarginWidth(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetMarginWidth,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetMarginWidth(self, *_args, **_kwargs) return val def GetMarginWidth(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetMarginWidth,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetMarginWidth(self, *_args, **_kwargs) return val def IsOwnerDrawn(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_IsOwnerDrawn,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_IsOwnerDrawn(self, *_args, **_kwargs) return val def ResetOwnerDrawn(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_ResetOwnerDrawn,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_ResetOwnerDrawn(self, *_args, **_kwargs) return val def SetBitmap(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_SetBitmap,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_SetBitmap(self, *_args, **_kwargs) return val def GetBitmap(self, *_args, **_kwargs): - val = apply(windowsc.wxMenuItem_GetBitmap,(self,) + _args, _kwargs) + val = windowsc.wxMenuItem_GetBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxMenuItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxMenuItem(wxMenuItemPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windowsc.new_wxMenuItem,_args,_kwargs) + self.this = windowsc.new_wxMenuItem(*_args,**_kwargs) self.thisown = 1 @@ -1176,19 +1197,19 @@ class wxMenuItem(wxMenuItemPtr): #-------------- FUNCTION WRAPPERS ------------------ def wxWindow_FromHWND(*_args, **_kwargs): - val = apply(windowsc.wxWindow_FromHWND,_args,_kwargs) + val = windowsc.wxWindow_FromHWND(*_args,**_kwargs) return val def wxFindWindowById(*_args, **_kwargs): - val = apply(windowsc.wxFindWindowById,_args,_kwargs) + val = windowsc.wxFindWindowById(*_args,**_kwargs) return val def wxFindWindowByName(*_args, **_kwargs): - val = apply(windowsc.wxFindWindowByName,_args,_kwargs) + val = windowsc.wxFindWindowByName(*_args,**_kwargs) return val def wxFindWindowByLabel(*_args, **_kwargs): - val = apply(windowsc.wxFindWindowByLabel,_args,_kwargs) + val = windowsc.wxFindWindowByLabel(*_args,**_kwargs) return val wxValidator_IsSilent = windowsc.wxValidator_IsSilent @@ -1196,7 +1217,7 @@ wxValidator_IsSilent = windowsc.wxValidator_IsSilent wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError def wxWindow_FindFocus(*_args, **_kwargs): - val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs) + val = windowsc.wxWindow_FindFocus(*_args,**_kwargs) return val wxWindow_NewControlId = windowsc.wxWindow_NewControlId @@ -1206,7 +1227,7 @@ wxWindow_NextControlId = windowsc.wxWindow_NextControlId wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId def wxWindow_GetCapture(*_args, **_kwargs): - val = apply(windowsc.wxWindow_GetCapture,_args,_kwargs) + val = windowsc.wxWindow_GetCapture(*_args,**_kwargs) return val wxMenuItem_GetLabelFromText = windowsc.wxMenuItem_GetLabelFromText diff --git a/wxPython/src/msw/windows2.cpp b/wxPython/src/msw/windows2.cpp index 9d6bdb5767..66f4ec09b1 100644 --- a/wxPython/src/msw/windows2.cpp +++ b/wxPython/src/msw/windows2.cpp @@ -59,7 +59,7 @@ extern PyObject *SWIG_newvarlink(void); #include #include #ifdef __WXMSW__ -#include +#include #endif // Put some wx default wxChar* values into wxStrings. @@ -700,63 +700,32 @@ static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args, P return _resultobj; } -#define wxNotebook_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) -static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebook_GetPage(_swigobj,_swigarg0) (_swigobj->GetPage(_swigarg0)) +static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; + wxWindow * _result; wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; char *_kwnames[] = { "self","page", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetSelection. Expected _wxNotebook_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebook_SetSelection(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxNotebook_AdvanceSelection(_swigobj,_swigarg0) (_swigobj->AdvanceSelection(_swigarg0)) -static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxNotebook * _arg0; - bool _arg1 = (bool ) TRUE; - PyObject * _argo0 = 0; - int tempbool1 = (int) TRUE; - char *_kwnames[] = { "self","forward", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AdvanceSelection. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPage. Expected _wxNotebook_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_AdvanceSelection(_arg0,_arg1); + _result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -1005,7 +974,7 @@ static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args, P int _arg1; int _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page","image", NULL }; + char *_kwnames[] = { "self","page","nImage", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxNotebook_SetPageImage",_kwnames,&_argo0,&_arg1,&_arg2)) @@ -1127,6 +1096,80 @@ static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxNotebook_SetTabSize(_swigobj,_swigarg0) (_swigobj->SetTabSize(_swigarg0)) +static PyObject *_wrap_wxNotebook_SetTabSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxNotebook * _arg0; + wxSize * _arg1; + PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","sz", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetTabSize",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetTabSize. Expected _wxNotebook_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxNotebook_SetTabSize(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxNotebook_CalcSizeFromPage(_swigobj,_swigarg0) (_swigobj->CalcSizeFromPage(_swigarg0)) +static PyObject *_wrap_wxNotebook_CalcSizeFromPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxNotebook * _arg0; + wxSize * _arg1; + PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","sizePage", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_CalcSizeFromPage",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_CalcSizeFromPage. Expected _wxNotebook_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxSize (wxNotebook_CalcSizeFromPage(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxNotebook_DeletePage(_swigobj,_swigarg0) (_swigobj->DeletePage(_swigarg0)) static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1220,15 +1263,16 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObje wxNotebook * _arg0; wxWindow * _arg1; wxString * _arg2; - int _arg3 = (int ) FALSE; + bool _arg3 = (bool ) FALSE; int _arg4 = (int ) -1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","page","text","select","imageId", NULL }; + int tempbool3 = (int) FALSE; + char *_kwnames[] = { "self","page","text","telect","imageId", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&tempbool3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1249,6 +1293,7 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObje if (_arg2 == NULL) return NULL; } + _arg3 = (bool ) tempbool3; { PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxNotebook_AddPage(_arg0,_arg1,*_arg2,_arg3,_arg4); @@ -1277,7 +1322,7 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyO PyObject * _argo2 = 0; PyObject * _obj3 = 0; int tempbool4 = (int) FALSE; - char *_kwnames[] = { "self","page","page","text","select","imageId", NULL }; + char *_kwnames[] = { "self","index","page","text","select","imageId", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|ii:wxNotebook_InsertPage",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) @@ -1316,58 +1361,104 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyO return _resultobj; } -#define wxNotebook_GetPage(_swigobj,_swigarg0) (_swigobj->GetPage(_swigarg0)) -static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebook_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxWindow * _result; + int _result; wxNotebook * _arg0; int _arg1; PyObject * _argo0 = 0; char *_kwnames[] = { "self","page", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPage. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetSelection. Expected _wxNotebook_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1); + _result = (int )wxNotebook_SetSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -static void wxNotebook_ResizeChildren(wxNotebook *self) { - wxSizeEvent evt(self->GetClientSize()); - self->GetEventHandler()->ProcessEvent(evt); +#define wxNotebook_HitTest(_swigobj,_swigarg0,_swigarg1) (_swigobj->HitTest(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxNotebook_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxNotebook * _arg0; + wxPoint * _arg1; + long * _arg2; + long temp; + PyObject * _argo0 = 0; + wxPoint temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + + self = self; +{ + _arg2 = &temp; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_HitTest",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_HitTest. Expected _wxNotebook_p."); + return NULL; } -static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args, PyObject *kwargs) { + } +{ + _arg1 = &temp0; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxNotebook_HitTest(_arg0,*_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxNotebook_AdvanceSelection(_swigobj,_swigarg0) (_swigobj->AdvanceSelection(_swigarg0)) +static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxNotebook * _arg0; + bool _arg1 = (bool ) TRUE; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + int tempbool1 = (int) TRUE; + char *_kwnames[] = { "self","forward", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_ResizeChildren",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_ResizeChildren. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AdvanceSelection. Expected _wxNotebook_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_ResizeChildren(_arg0); + wxNotebook_AdvanceSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1617,7 +1708,7 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb wxWindowID _arg1; wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; wxSize * _arg3 = (wxSize *) &wxDefaultSize; - long _arg4 = (long ) wxSP_3D|wxCLIP_CHILDREN; + long _arg4 = (long ) (wxSP_3D)|wxCLIP_CHILDREN; wxString * _arg5 = (wxString *) &wxPySplitterNameStr; PyObject * _argo0 = 0; wxPoint temp; @@ -1711,7 +1802,7 @@ static PyObject *_wrap_wxSplitterWindow_Create(PyObject *self, PyObject *args, P wxWindowID _arg2; wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) wxSP_3D|wxCLIP_CHILDREN; + long _arg5 = (long ) (wxSP_3D)|wxCLIP_CHILDREN; wxString * _arg6 = (wxString *) &wxPySplitterNameStr; PyObject * _argo0 = 0; PyObject * _argo1 = 0; @@ -2444,6 +2535,58 @@ static PyObject *_wrap_wxSplitterWindow_GetNeedUpdating(PyObject *self, PyObject return _resultobj; } +static void *SwigwxTaskBarIconEventTowxEvent(void *ptr) { + wxTaskBarIconEvent *src; + wxEvent *dest; + src = (wxTaskBarIconEvent *) ptr; + dest = (wxEvent *) src; + return (void *) dest; +} + +static void *SwigwxTaskBarIconEventTowxObject(void *ptr) { + wxTaskBarIconEvent *src; + wxObject *dest; + src = (wxTaskBarIconEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxTaskBarIconEvent(_swigarg0,_swigarg1) (new wxTaskBarIconEvent(_swigarg0,_swigarg1)) +static PyObject *_wrap_new_wxTaskBarIconEvent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTaskBarIconEvent * _result; + wxEventType _arg0; + wxTaskBarIcon * _arg1; + PyObject * _argo1 = 0; + char *_kwnames[] = { "evtType","tbIcon", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:new_wxTaskBarIconEvent",_kwnames,&_arg0,&_argo1)) + return NULL; + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTaskBarIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxTaskBarIconEvent. Expected _wxTaskBarIcon_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxTaskBarIconEvent *)new_wxTaskBarIconEvent(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTaskBarIconEvent_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + static void *SwigwxTaskBarIconTowxEvtHandler(void *ptr) { wxTaskBarIcon *src; wxEvtHandler *dest; @@ -4965,6 +5108,7 @@ static PyMethodDef windows2cMethods[] = { { "wxTaskBarIcon_SetIcon", (PyCFunction) _wrap_wxTaskBarIcon_SetIcon, METH_VARARGS | METH_KEYWORDS }, { "delete_wxTaskBarIcon", (PyCFunction) _wrap_delete_wxTaskBarIcon, METH_VARARGS | METH_KEYWORDS }, { "new_wxTaskBarIcon", (PyCFunction) _wrap_new_wxTaskBarIcon, METH_VARARGS | METH_KEYWORDS }, + { "new_wxTaskBarIconEvent", (PyCFunction) _wrap_new_wxTaskBarIconEvent, METH_VARARGS | METH_KEYWORDS }, { "wxSplitterWindow_GetNeedUpdating", (PyCFunction) _wrap_wxSplitterWindow_GetNeedUpdating, METH_VARARGS | METH_KEYWORDS }, { "wxSplitterWindow_SetNeedUpdating", (PyCFunction) _wrap_wxSplitterWindow_SetNeedUpdating, METH_VARARGS | METH_KEYWORDS }, { "wxSplitterWindow_SizeWindows", (PyCFunction) _wrap_wxSplitterWindow_SizeWindows, METH_VARARGS | METH_KEYWORDS }, @@ -4995,13 +5139,16 @@ static PyMethodDef windows2cMethods[] = { { "wxSplitterEvent_GetX", (PyCFunction) _wrap_wxSplitterEvent_GetX, METH_VARARGS | METH_KEYWORDS }, { "wxSplitterEvent_GetSashPosition", (PyCFunction) _wrap_wxSplitterEvent_GetSashPosition, METH_VARARGS | METH_KEYWORDS }, { "new_wxSplitterEvent", (PyCFunction) _wrap_new_wxSplitterEvent, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_ResizeChildren", (PyCFunction) _wrap_wxNotebook_ResizeChildren, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_GetPage", (PyCFunction) _wrap_wxNotebook_GetPage, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_AdvanceSelection", (PyCFunction) _wrap_wxNotebook_AdvanceSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_HitTest", (PyCFunction) _wrap_wxNotebook_HitTest, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_SetSelection", (PyCFunction) _wrap_wxNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_InsertPage", (PyCFunction) _wrap_wxNotebook_InsertPage, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_AddPage", (PyCFunction) _wrap_wxNotebook_AddPage, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_DeleteAllPages", (PyCFunction) _wrap_wxNotebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_RemovePage", (PyCFunction) _wrap_wxNotebook_RemovePage, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_DeletePage", (PyCFunction) _wrap_wxNotebook_DeletePage, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_CalcSizeFromPage", (PyCFunction) _wrap_wxNotebook_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_SetTabSize", (PyCFunction) _wrap_wxNotebook_SetTabSize, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_SetPadding", (PyCFunction) _wrap_wxNotebook_SetPadding, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_SetPageSize", (PyCFunction) _wrap_wxNotebook_SetPageSize, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_GetRowCount", (PyCFunction) _wrap_wxNotebook_GetRowCount, METH_VARARGS | METH_KEYWORDS }, @@ -5013,8 +5160,7 @@ static PyMethodDef windows2cMethods[] = { { "wxNotebook_GetPageText", (PyCFunction) _wrap_wxNotebook_GetPageText, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_SetPageText", (PyCFunction) _wrap_wxNotebook_SetPageText, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_GetSelection", (PyCFunction) _wrap_wxNotebook_GetSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_AdvanceSelection", (PyCFunction) _wrap_wxNotebook_AdvanceSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_SetSelection", (PyCFunction) _wrap_wxNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_GetPage", (PyCFunction) _wrap_wxNotebook_GetPage, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_GetPageCount", (PyCFunction) _wrap_wxNotebook_GetPageCount, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_Create", (PyCFunction) _wrap_wxNotebook_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreNotebook", (PyCFunction) _wrap_new_wxPreNotebook, METH_VARARGS | METH_KEYWORDS }, @@ -5033,6 +5179,7 @@ static PyMethodDef windows2cMethods[] = { * This table is used by the pointer type-checker */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { + { "_wxEvent","_wxTaskBarIconEvent",SwigwxTaskBarIconEventTowxEvent}, { "_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent}, { "_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent}, { "_signed_long","_long",0}, @@ -5091,6 +5238,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxObject","_wxPyControl",SwigwxPyControlTowxObject}, { "_wxObject","_wxPyWindow",SwigwxPyWindowTowxObject}, { "_wxObject","_wxTaskBarIcon",SwigwxTaskBarIconTowxObject}, + { "_wxObject","_wxTaskBarIconEvent",SwigwxTaskBarIconEventTowxObject}, { "_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject}, { "_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject}, { "_wxObject","_wxNotebook",SwigwxNotebookTowxObject}, @@ -5168,6 +5316,16 @@ SWIGEXPORT(void) initwindows2c() { d = PyModule_GetDict(m); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH)); + PyDict_SetItemString(d,"wxNB_TOP", PyInt_FromLong((long) wxNB_TOP)); + PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT)); + PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT)); + PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM)); + PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE)); + PyDict_SetItemString(d,"wxNB_HITTEST_NOWHERE", PyInt_FromLong((long) wxNB_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"wxNB_HITTEST_ONICON", PyInt_FromLong((long) wxNB_HITTEST_ONICON)); + PyDict_SetItemString(d,"wxNB_HITTEST_ONLABEL", PyInt_FromLong((long) wxNB_HITTEST_ONLABEL)); + PyDict_SetItemString(d,"wxNB_HITTEST_ONITEM", PyInt_FromLong((long) wxNB_HITTEST_ONITEM)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT)); @@ -5177,6 +5335,18 @@ SWIGEXPORT(void) initwindows2c() { PyDict_SetItemString(d,"wxSPLIT_DRAG_NONE", PyInt_FromLong((long) wxSPLIT_DRAG_NONE)); PyDict_SetItemString(d,"wxSPLIT_DRAG_DRAGGING", PyInt_FromLong((long) wxSPLIT_DRAG_DRAGGING)); PyDict_SetItemString(d,"wxSPLIT_DRAG_LEFT_DOWN", PyInt_FromLong((long) wxSPLIT_DRAG_LEFT_DOWN)); + PyDict_SetItemString(d,"wxSP_VERTICAL", PyInt_FromLong((long) wxSP_VERTICAL)); + PyDict_SetItemString(d,"wxSP_HORIZONTAL", PyInt_FromLong((long) wxSP_HORIZONTAL)); + PyDict_SetItemString(d,"wxSP_ARROW_KEYS", PyInt_FromLong((long) wxSP_ARROW_KEYS)); + PyDict_SetItemString(d,"wxSP_WRAP", PyInt_FromLong((long) wxSP_WRAP)); + PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER)); + PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D)); + PyDict_SetItemString(d,"wxSP_3DSASH", PyInt_FromLong((long) wxSP_3DSASH)); + PyDict_SetItemString(d,"wxSP_3DBORDER", PyInt_FromLong((long) wxSP_3DBORDER)); + PyDict_SetItemString(d,"wxSP_FULLSASH", PyInt_FromLong((long) wxSP_FULLSASH)); + PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER)); + PyDict_SetItemString(d,"wxSP_LIVE_UPDATE", PyInt_FromLong((long) wxSP_LIVE_UPDATE)); + PyDict_SetItemString(d,"wxSP_PERMIT_UNSPLIT", PyInt_FromLong((long) wxSP_PERMIT_UNSPLIT)); PyDict_SetItemString(d,"wxEVT_TASKBAR_MOVE", PyInt_FromLong((long) wxEVT_TASKBAR_MOVE)); PyDict_SetItemString(d,"wxEVT_TASKBAR_LEFT_DOWN", PyInt_FromLong((long) wxEVT_TASKBAR_LEFT_DOWN)); PyDict_SetItemString(d,"wxEVT_TASKBAR_LEFT_UP", PyInt_FromLong((long) wxEVT_TASKBAR_LEFT_UP)); diff --git a/wxPython/src/msw/windows2.py b/wxPython/src/msw/windows2.py index b263d3c4c7..f5b73d4c9b 100644 --- a/wxPython/src/msw/windows2.py +++ b/wxPython/src/msw/windows2.py @@ -15,27 +15,49 @@ from controls import * from events import * import wx + +def EVT_TASKBAR_MOVE(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func) + +def EVT_TASKBAR_LEFT_DOWN(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func) + +def EVT_TASKBAR_LEFT_UP(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func) + +def EVT_TASKBAR_RIGHT_DOWN(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func) + +def EVT_TASKBAR_RIGHT_UP(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func) + +def EVT_TASKBAR_LEFT_DCLICK(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func) + +def EVT_TASKBAR_RIGHT_DCLICK(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func) + class wxNotebookEventPtr(wxNotifyEventPtr): def __init__(self,this): self.this = this self.thisown = 0 def GetSelection(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebookEvent_GetSelection,(self,) + _args, _kwargs) + val = windows2c.wxNotebookEvent_GetSelection(self, *_args, **_kwargs) return val def GetOldSelection(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebookEvent_GetOldSelection,(self,) + _args, _kwargs) + val = windows2c.wxNotebookEvent_GetOldSelection(self, *_args, **_kwargs) return val def SetOldSelection(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebookEvent_SetOldSelection,(self,) + _args, _kwargs) + val = windows2c.wxNotebookEvent_SetOldSelection(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebookEvent_SetSelection,(self,) + _args, _kwargs) + val = windows2c.wxNotebookEvent_SetSelection(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxNotebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxNotebookEvent(wxNotebookEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxNotebookEvent,_args,_kwargs) + self.this = windows2c.new_wxNotebookEvent(*_args,**_kwargs) self.thisown = 1 @@ -46,84 +68,91 @@ class wxNotebookPtr(wxControlPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_Create,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_Create(self, *_args, **_kwargs) return val def GetPageCount(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_GetPageCount,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_GetPageCount(self, *_args, **_kwargs) return val - def SetSelection(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_SetSelection,(self,) + _args, _kwargs) - return val - def AdvanceSelection(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_AdvanceSelection,(self,) + _args, _kwargs) + def GetPage(self, *_args, **_kwargs): + val = windows2c.wxNotebook_GetPage(self, *_args, **_kwargs) return val def GetSelection(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_GetSelection,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_GetSelection(self, *_args, **_kwargs) return val def SetPageText(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_SetPageText,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_SetPageText(self, *_args, **_kwargs) return val def GetPageText(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_GetPageText,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_GetPageText(self, *_args, **_kwargs) return val def SetImageList(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_SetImageList,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_SetImageList(self, *_args, **_kwargs) return val def AssignImageList(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_AssignImageList,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_AssignImageList(self, *_args, **_kwargs) _args[0].thisown = 0 return val def GetImageList(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_GetImageList,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_GetImageList(self, *_args, **_kwargs) return val def GetPageImage(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_GetPageImage,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_GetPageImage(self, *_args, **_kwargs) return val def SetPageImage(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_SetPageImage,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_SetPageImage(self, *_args, **_kwargs) return val def GetRowCount(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_GetRowCount,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_GetRowCount(self, *_args, **_kwargs) return val def SetPageSize(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_SetPageSize,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_SetPageSize(self, *_args, **_kwargs) return val def SetPadding(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_SetPadding,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_SetPadding(self, *_args, **_kwargs) + return val + def SetTabSize(self, *_args, **_kwargs): + val = windows2c.wxNotebook_SetTabSize(self, *_args, **_kwargs) + return val + def CalcSizeFromPage(self, *_args, **_kwargs): + val = windows2c.wxNotebook_CalcSizeFromPage(self, *_args, **_kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 return val def DeletePage(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_DeletePage,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_DeletePage(self, *_args, **_kwargs) return val def RemovePage(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_RemovePage,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_RemovePage(self, *_args, **_kwargs) return val def DeleteAllPages(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_DeleteAllPages,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_DeleteAllPages(self, *_args, **_kwargs) return val def AddPage(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_AddPage,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_AddPage(self, *_args, **_kwargs) return val def InsertPage(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_InsertPage,(self,) + _args, _kwargs) + val = windows2c.wxNotebook_InsertPage(self, *_args, **_kwargs) return val - def GetPage(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_GetPage,(self,) + _args, _kwargs) + def SetSelection(self, *_args, **_kwargs): + val = windows2c.wxNotebook_SetSelection(self, *_args, **_kwargs) return val - def ResizeChildren(self, *_args, **_kwargs): - val = apply(windows2c.wxNotebook_ResizeChildren,(self,) + _args, _kwargs) + def HitTest(self, *_args, **_kwargs): + val = windows2c.wxNotebook_HitTest(self, *_args, **_kwargs) + return val + def AdvanceSelection(self, *_args, **_kwargs): + val = windows2c.wxNotebook_AdvanceSelection(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxNotebook(wxNotebookPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxNotebook,_args,_kwargs) + self.this = windows2c.new_wxNotebook(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreNotebook(*_args,**_kwargs): - val = wxNotebookPtr(apply(windows2c.new_wxPreNotebook,_args,_kwargs)) + val = wxNotebookPtr(windows2c.new_wxPreNotebook(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -134,25 +163,25 @@ class wxSplitterEventPtr(wxNotifyEventPtr): self.this = this self.thisown = 0 def GetSashPosition(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterEvent_GetSashPosition,(self,) + _args, _kwargs) + val = windows2c.wxSplitterEvent_GetSashPosition(self, *_args, **_kwargs) return val def GetX(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterEvent_GetX,(self,) + _args, _kwargs) + val = windows2c.wxSplitterEvent_GetX(self, *_args, **_kwargs) return val def GetY(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterEvent_GetY,(self,) + _args, _kwargs) + val = windows2c.wxSplitterEvent_GetY(self, *_args, **_kwargs) return val def GetWindowBeingRemoved(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterEvent_GetWindowBeingRemoved,(self,) + _args, _kwargs) + val = windows2c.wxSplitterEvent_GetWindowBeingRemoved(self, *_args, **_kwargs) return val def SetSashPosition(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterEvent_SetSashPosition,(self,) + _args, _kwargs) + val = windows2c.wxSplitterEvent_SetSashPosition(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSplitterEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSplitterEvent(wxSplitterEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxSplitterEvent,_args,_kwargs) + self.this = windows2c.new_wxSplitterEvent(*_args,**_kwargs) self.thisown = 1 @@ -163,88 +192,102 @@ class wxSplitterWindowPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_Create,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_Create(self, *_args, **_kwargs) return val def GetWindow1(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetWindow1,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetWindow1(self, *_args, **_kwargs) return val def GetWindow2(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetWindow2,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetWindow2(self, *_args, **_kwargs) return val def SetSplitMode(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SetSplitMode,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SetSplitMode(self, *_args, **_kwargs) return val def GetSplitMode(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetSplitMode,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetSplitMode(self, *_args, **_kwargs) return val def Initialize(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_Initialize,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_Initialize(self, *_args, **_kwargs) return val def SplitVertically(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SplitVertically,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SplitVertically(self, *_args, **_kwargs) return val def SplitHorizontally(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SplitHorizontally,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SplitHorizontally(self, *_args, **_kwargs) return val def Unsplit(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_Unsplit,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_Unsplit(self, *_args, **_kwargs) return val def ReplaceWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_ReplaceWindow,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_ReplaceWindow(self, *_args, **_kwargs) return val def IsSplit(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_IsSplit,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_IsSplit(self, *_args, **_kwargs) return val def SetSashSize(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SetSashSize,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SetSashSize(self, *_args, **_kwargs) return val def SetBorderSize(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SetBorderSize,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SetBorderSize(self, *_args, **_kwargs) return val def GetSashSize(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetSashSize,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetSashSize(self, *_args, **_kwargs) return val def GetBorderSize(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetBorderSize,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetBorderSize(self, *_args, **_kwargs) return val def SetSashPosition(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SetSashPosition,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SetSashPosition(self, *_args, **_kwargs) return val def GetSashPosition(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetSashPosition,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetSashPosition(self, *_args, **_kwargs) return val def SetMinimumPaneSize(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SetMinimumPaneSize,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SetMinimumPaneSize(self, *_args, **_kwargs) return val def GetMinimumPaneSize(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetMinimumPaneSize,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetMinimumPaneSize(self, *_args, **_kwargs) return val def SizeWindows(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SizeWindows,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SizeWindows(self, *_args, **_kwargs) return val def SetNeedUpdating(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_SetNeedUpdating,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_SetNeedUpdating(self, *_args, **_kwargs) return val def GetNeedUpdating(self, *_args, **_kwargs): - val = apply(windows2c.wxSplitterWindow_GetNeedUpdating,(self,) + _args, _kwargs) + val = windows2c.wxSplitterWindow_GetNeedUpdating(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSplitterWindow(wxSplitterWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxSplitterWindow,_args,_kwargs) + self.this = windows2c.new_wxSplitterWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreSplitterWindow(*_args,**_kwargs): - val = wxSplitterWindowPtr(apply(windows2c.new_wxPreSplitterWindow,_args,_kwargs)) + val = wxSplitterWindowPtr(windows2c.new_wxPreSplitterWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val +class wxTaskBarIconEventPtr(wxEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxTaskBarIconEvent(wxTaskBarIconEventPtr): + def __init__(self,*_args,**_kwargs): + self.this = windows2c.new_wxTaskBarIconEvent(*_args,**_kwargs) + self.thisown = 1 + + + + class wxTaskBarIconPtr(wxEvtHandlerPtr): def __init__(self,this): self.this = this @@ -256,25 +299,25 @@ class wxTaskBarIconPtr(wxEvtHandlerPtr): except: pass def SetIcon(self, *_args, **_kwargs): - val = apply(windows2c.wxTaskBarIcon_SetIcon,(self,) + _args, _kwargs) + val = windows2c.wxTaskBarIcon_SetIcon(self, *_args, **_kwargs) return val def RemoveIcon(self, *_args, **_kwargs): - val = apply(windows2c.wxTaskBarIcon_RemoveIcon,(self,) + _args, _kwargs) + val = windows2c.wxTaskBarIcon_RemoveIcon(self, *_args, **_kwargs) return val def PopupMenu(self, *_args, **_kwargs): - val = apply(windows2c.wxTaskBarIcon_PopupMenu,(self,) + _args, _kwargs) + val = windows2c.wxTaskBarIcon_PopupMenu(self, *_args, **_kwargs) return val def IsIconInstalled(self, *_args, **_kwargs): - val = apply(windows2c.wxTaskBarIcon_IsIconInstalled,(self,) + _args, _kwargs) + val = windows2c.wxTaskBarIcon_IsIconInstalled(self, *_args, **_kwargs) return val def IsOK(self, *_args, **_kwargs): - val = apply(windows2c.wxTaskBarIcon_IsOK,(self,) + _args, _kwargs) + val = windows2c.wxTaskBarIcon_IsOK(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTaskBarIcon(wxTaskBarIconPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxTaskBarIcon,_args,_kwargs) + self.this = windows2c.new_wxTaskBarIcon(*_args,**_kwargs) self.thisown = 1 wx._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE) wx._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN) @@ -292,70 +335,70 @@ class wxPyWindowPtr(wxWindowPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow__setCallbackInfo,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow__setCallbackInfo(self, *_args, **_kwargs) return val def base_DoMoveWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoMoveWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoMoveWindow(self, *_args, **_kwargs) return val def base_DoSetSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoSetSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoSetSize(self, *_args, **_kwargs) return val def base_DoSetClientSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoSetClientSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoSetClientSize(self, *_args, **_kwargs) return val def base_DoSetVirtualSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoSetVirtualSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoSetVirtualSize(self, *_args, **_kwargs) return val def base_DoGetSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoGetSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoGetSize(self, *_args, **_kwargs) return val def base_DoGetClientSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoGetClientSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoGetClientSize(self, *_args, **_kwargs) return val def base_DoGetPosition(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoGetPosition,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoGetPosition(self, *_args, **_kwargs) return val def base_DoGetVirtualSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoGetVirtualSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoGetVirtualSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_DoGetBestSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_DoGetBestSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_DoGetBestSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_InitDialog(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_InitDialog,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_InitDialog(self, *_args, **_kwargs) return val def base_TransferDataToWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_TransferDataToWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_TransferDataToWindow(self, *_args, **_kwargs) return val def base_TransferDataFromWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_TransferDataFromWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_TransferDataFromWindow(self, *_args, **_kwargs) return val def base_Validate(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_Validate,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_Validate(self, *_args, **_kwargs) return val def base_AcceptsFocus(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_AcceptsFocus,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_AcceptsFocus(self, *_args, **_kwargs) return val def base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_AcceptsFocusFromKeyboard,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs) return val def base_GetMaxSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_GetMaxSize,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_GetMaxSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_AddChild(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_AddChild,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_AddChild(self, *_args, **_kwargs) return val def base_RemoveChild(self, *_args, **_kwargs): - val = apply(windows2c.wxPyWindow_base_RemoveChild,(self,) + _args, _kwargs) + val = windows2c.wxPyWindow_base_RemoveChild(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyWindow(wxPyWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxPyWindow,_args,_kwargs) + self.this = windows2c.new_wxPyWindow(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyWindow) self._setOORInfo(self) @@ -368,70 +411,70 @@ class wxPyControlPtr(wxControlPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl__setCallbackInfo,(self,) + _args, _kwargs) + val = windows2c.wxPyControl__setCallbackInfo(self, *_args, **_kwargs) return val def base_DoMoveWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoMoveWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoMoveWindow(self, *_args, **_kwargs) return val def base_DoSetSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoSetSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoSetSize(self, *_args, **_kwargs) return val def base_DoSetClientSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoSetClientSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoSetClientSize(self, *_args, **_kwargs) return val def base_DoSetVirtualSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoSetVirtualSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoSetVirtualSize(self, *_args, **_kwargs) return val def base_DoGetSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoGetSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoGetSize(self, *_args, **_kwargs) return val def base_DoGetClientSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoGetClientSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoGetClientSize(self, *_args, **_kwargs) return val def base_DoGetPosition(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoGetPosition,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoGetPosition(self, *_args, **_kwargs) return val def base_DoGetVirtualSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoGetVirtualSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoGetVirtualSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_DoGetBestSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_DoGetBestSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_DoGetBestSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_InitDialog(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_InitDialog,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_InitDialog(self, *_args, **_kwargs) return val def base_TransferDataToWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_TransferDataToWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_TransferDataToWindow(self, *_args, **_kwargs) return val def base_TransferDataFromWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_TransferDataFromWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_TransferDataFromWindow(self, *_args, **_kwargs) return val def base_Validate(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_Validate,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_Validate(self, *_args, **_kwargs) return val def base_AcceptsFocus(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_AcceptsFocus,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_AcceptsFocus(self, *_args, **_kwargs) return val def base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_AcceptsFocusFromKeyboard,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs) return val def base_GetMaxSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_GetMaxSize,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_GetMaxSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_AddChild(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_AddChild,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_AddChild(self, *_args, **_kwargs) return val def base_RemoveChild(self, *_args, **_kwargs): - val = apply(windows2c.wxPyControl_base_RemoveChild,(self,) + _args, _kwargs) + val = windows2c.wxPyControl_base_RemoveChild(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyControl(wxPyControlPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxPyControl,_args,_kwargs) + self.this = windows2c.new_wxPyControl(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyControl) self._setOORInfo(self) @@ -444,70 +487,70 @@ class wxPyPanelPtr(wxPanelPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel__setCallbackInfo,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel__setCallbackInfo(self, *_args, **_kwargs) return val def base_DoMoveWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoMoveWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoMoveWindow(self, *_args, **_kwargs) return val def base_DoSetSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoSetSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoSetSize(self, *_args, **_kwargs) return val def base_DoSetClientSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoSetClientSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoSetClientSize(self, *_args, **_kwargs) return val def base_DoSetVirtualSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoSetVirtualSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoSetVirtualSize(self, *_args, **_kwargs) return val def base_DoGetSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoGetSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoGetSize(self, *_args, **_kwargs) return val def base_DoGetClientSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoGetClientSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoGetClientSize(self, *_args, **_kwargs) return val def base_DoGetPosition(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoGetPosition,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoGetPosition(self, *_args, **_kwargs) return val def base_DoGetVirtualSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoGetVirtualSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoGetVirtualSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_DoGetBestSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_DoGetBestSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_DoGetBestSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_InitDialog(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_InitDialog,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_InitDialog(self, *_args, **_kwargs) return val def base_TransferDataToWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_TransferDataToWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_TransferDataToWindow(self, *_args, **_kwargs) return val def base_TransferDataFromWindow(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_TransferDataFromWindow,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_TransferDataFromWindow(self, *_args, **_kwargs) return val def base_Validate(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_Validate,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_Validate(self, *_args, **_kwargs) return val def base_AcceptsFocus(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_AcceptsFocus,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_AcceptsFocus(self, *_args, **_kwargs) return val def base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_AcceptsFocusFromKeyboard,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs) return val def base_GetMaxSize(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_GetMaxSize,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_GetMaxSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_AddChild(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_AddChild,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_AddChild(self, *_args, **_kwargs) return val def base_RemoveChild(self, *_args, **_kwargs): - val = apply(windows2c.wxPyPanel_base_RemoveChild,(self,) + _args, _kwargs) + val = windows2c.wxPyPanel_base_RemoveChild(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyPanel(wxPyPanelPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows2c.new_wxPyPanel,_args,_kwargs) + self.this = windows2c.new_wxPyPanel(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyPanel) self._setOORInfo(self) @@ -525,6 +568,16 @@ class wxPyPanel(wxPyPanelPtr): wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = windows2c.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = windows2c.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING +wxNB_FIXEDWIDTH = windows2c.wxNB_FIXEDWIDTH +wxNB_TOP = windows2c.wxNB_TOP +wxNB_LEFT = windows2c.wxNB_LEFT +wxNB_RIGHT = windows2c.wxNB_RIGHT +wxNB_BOTTOM = windows2c.wxNB_BOTTOM +wxNB_MULTILINE = windows2c.wxNB_MULTILINE +wxNB_HITTEST_NOWHERE = windows2c.wxNB_HITTEST_NOWHERE +wxNB_HITTEST_ONICON = windows2c.wxNB_HITTEST_ONICON +wxNB_HITTEST_ONLABEL = windows2c.wxNB_HITTEST_ONLABEL +wxNB_HITTEST_ONITEM = windows2c.wxNB_HITTEST_ONITEM wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = windows2c.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = windows2c.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED wxEVT_COMMAND_SPLITTER_UNSPLIT = windows2c.wxEVT_COMMAND_SPLITTER_UNSPLIT @@ -534,6 +587,18 @@ wxSPLIT_VERTICAL = windows2c.wxSPLIT_VERTICAL wxSPLIT_DRAG_NONE = windows2c.wxSPLIT_DRAG_NONE wxSPLIT_DRAG_DRAGGING = windows2c.wxSPLIT_DRAG_DRAGGING wxSPLIT_DRAG_LEFT_DOWN = windows2c.wxSPLIT_DRAG_LEFT_DOWN +wxSP_VERTICAL = windows2c.wxSP_VERTICAL +wxSP_HORIZONTAL = windows2c.wxSP_HORIZONTAL +wxSP_ARROW_KEYS = windows2c.wxSP_ARROW_KEYS +wxSP_WRAP = windows2c.wxSP_WRAP +wxSP_NOBORDER = windows2c.wxSP_NOBORDER +wxSP_3D = windows2c.wxSP_3D +wxSP_3DSASH = windows2c.wxSP_3DSASH +wxSP_3DBORDER = windows2c.wxSP_3DBORDER +wxSP_FULLSASH = windows2c.wxSP_FULLSASH +wxSP_BORDER = windows2c.wxSP_BORDER +wxSP_LIVE_UPDATE = windows2c.wxSP_LIVE_UPDATE +wxSP_PERMIT_UNSPLIT = windows2c.wxSP_PERMIT_UNSPLIT wxEVT_TASKBAR_MOVE = windows2c.wxEVT_TASKBAR_MOVE wxEVT_TASKBAR_LEFT_DOWN = windows2c.wxEVT_TASKBAR_LEFT_DOWN wxEVT_TASKBAR_LEFT_UP = windows2c.wxEVT_TASKBAR_LEFT_UP diff --git a/wxPython/src/msw/windows3.cpp b/wxPython/src/msw/windows3.cpp index 41a235941a..cde6b1594a 100644 --- a/wxPython/src/msw/windows3.cpp +++ b/wxPython/src/msw/windows3.cpp @@ -57,10 +57,8 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include #include -#ifndef __WXMAC__ #include #include -#endif static PyObject* t_output_helper(PyObject* target, PyObject* o) { diff --git a/wxPython/src/msw/windows3.py b/wxPython/src/msw/windows3.py index c7a571f564..dd7b26accd 100644 --- a/wxPython/src/msw/windows3.py +++ b/wxPython/src/msw/windows3.py @@ -28,29 +28,29 @@ class wxSashEventPtr(wxCommandEventPtr): self.this = this self.thisown = 0 def SetEdge(self, *_args, **_kwargs): - val = apply(windows3c.wxSashEvent_SetEdge,(self,) + _args, _kwargs) + val = windows3c.wxSashEvent_SetEdge(self, *_args, **_kwargs) return val def GetEdge(self, *_args, **_kwargs): - val = apply(windows3c.wxSashEvent_GetEdge,(self,) + _args, _kwargs) + val = windows3c.wxSashEvent_GetEdge(self, *_args, **_kwargs) return val def SetDragRect(self, *_args, **_kwargs): - val = apply(windows3c.wxSashEvent_SetDragRect,(self,) + _args, _kwargs) + val = windows3c.wxSashEvent_SetDragRect(self, *_args, **_kwargs) return val def GetDragRect(self, *_args, **_kwargs): - val = apply(windows3c.wxSashEvent_GetDragRect,(self,) + _args, _kwargs) + val = windows3c.wxSashEvent_GetDragRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def SetDragStatus(self, *_args, **_kwargs): - val = apply(windows3c.wxSashEvent_SetDragStatus,(self,) + _args, _kwargs) + val = windows3c.wxSashEvent_SetDragStatus(self, *_args, **_kwargs) return val def GetDragStatus(self, *_args, **_kwargs): - val = apply(windows3c.wxSashEvent_GetDragStatus,(self,) + _args, _kwargs) + val = windows3c.wxSashEvent_GetDragStatus(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSashEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSashEvent(wxSashEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxSashEvent,_args,_kwargs) + self.this = windows3c.new_wxSashEvent(*_args,**_kwargs) self.thisown = 1 @@ -61,71 +61,71 @@ class wxSashWindowPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_Create,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_Create(self, *_args, **_kwargs) return val def GetSashVisible(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetSashVisible,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetSashVisible(self, *_args, **_kwargs) return val def GetDefaultBorderSize(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetDefaultBorderSize,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetDefaultBorderSize(self, *_args, **_kwargs) return val def GetEdgeMargin(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetEdgeMargin,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetEdgeMargin(self, *_args, **_kwargs) return val def GetExtraBorderSize(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetExtraBorderSize,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetExtraBorderSize(self, *_args, **_kwargs) return val def GetMaximumSizeX(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetMaximumSizeX,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetMaximumSizeX(self, *_args, **_kwargs) return val def GetMaximumSizeY(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetMaximumSizeY,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetMaximumSizeY(self, *_args, **_kwargs) return val def GetMinimumSizeX(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetMinimumSizeX,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetMinimumSizeX(self, *_args, **_kwargs) return val def GetMinimumSizeY(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_GetMinimumSizeY,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_GetMinimumSizeY(self, *_args, **_kwargs) return val def HasBorder(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_HasBorder,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_HasBorder(self, *_args, **_kwargs) return val def SetDefaultBorderSize(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetDefaultBorderSize,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetDefaultBorderSize(self, *_args, **_kwargs) return val def SetExtraBorderSize(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetExtraBorderSize,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetExtraBorderSize(self, *_args, **_kwargs) return val def SetMaximumSizeX(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetMaximumSizeX,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetMaximumSizeX(self, *_args, **_kwargs) return val def SetMaximumSizeY(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetMaximumSizeY,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetMaximumSizeY(self, *_args, **_kwargs) return val def SetMinimumSizeX(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetMinimumSizeX,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetMinimumSizeX(self, *_args, **_kwargs) return val def SetMinimumSizeY(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetMinimumSizeY,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetMinimumSizeY(self, *_args, **_kwargs) return val def SetSashVisible(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetSashVisible,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetSashVisible(self, *_args, **_kwargs) return val def SetSashBorder(self, *_args, **_kwargs): - val = apply(windows3c.wxSashWindow_SetSashBorder,(self,) + _args, _kwargs) + val = windows3c.wxSashWindow_SetSashBorder(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSashWindow(wxSashWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxSashWindow,_args,_kwargs) + self.this = windows3c.new_wxSashWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreSashWindow(*_args,**_kwargs): - val = wxSashWindowPtr(apply(windows3c.new_wxPreSashWindow,_args,_kwargs)) + val = wxSashWindowPtr(windows3c.new_wxPreSashWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -136,41 +136,41 @@ class wxQueryLayoutInfoEventPtr(wxEventPtr): self.this = this self.thisown = 0 def SetRequestedLength(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_SetRequestedLength,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_SetRequestedLength(self, *_args, **_kwargs) return val def GetRequestedLength(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_GetRequestedLength,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_GetRequestedLength(self, *_args, **_kwargs) return val def SetFlags(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_SetFlags,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_SetFlags(self, *_args, **_kwargs) return val def GetFlags(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_GetFlags,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_GetFlags(self, *_args, **_kwargs) return val def SetSize(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_SetSize,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_SetSize(self, *_args, **_kwargs) return val def GetSize(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_GetSize,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_GetSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def SetOrientation(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_SetOrientation,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_SetOrientation(self, *_args, **_kwargs) return val def GetOrientation(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_GetOrientation,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_GetOrientation(self, *_args, **_kwargs) return val def SetAlignment(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_SetAlignment,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_SetAlignment(self, *_args, **_kwargs) return val def GetAlignment(self, *_args, **_kwargs): - val = apply(windows3c.wxQueryLayoutInfoEvent_GetAlignment,(self,) + _args, _kwargs) + val = windows3c.wxQueryLayoutInfoEvent_GetAlignment(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxQueryLayoutInfoEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxQueryLayoutInfoEvent(wxQueryLayoutInfoEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxQueryLayoutInfoEvent,_args,_kwargs) + self.this = windows3c.new_wxQueryLayoutInfoEvent(*_args,**_kwargs) self.thisown = 1 @@ -181,23 +181,23 @@ class wxCalculateLayoutEventPtr(wxEventPtr): self.this = this self.thisown = 0 def SetFlags(self, *_args, **_kwargs): - val = apply(windows3c.wxCalculateLayoutEvent_SetFlags,(self,) + _args, _kwargs) + val = windows3c.wxCalculateLayoutEvent_SetFlags(self, *_args, **_kwargs) return val def GetFlags(self, *_args, **_kwargs): - val = apply(windows3c.wxCalculateLayoutEvent_GetFlags,(self,) + _args, _kwargs) + val = windows3c.wxCalculateLayoutEvent_GetFlags(self, *_args, **_kwargs) return val def SetRect(self, *_args, **_kwargs): - val = apply(windows3c.wxCalculateLayoutEvent_SetRect,(self,) + _args, _kwargs) + val = windows3c.wxCalculateLayoutEvent_SetRect(self, *_args, **_kwargs) return val def GetRect(self, *_args, **_kwargs): - val = apply(windows3c.wxCalculateLayoutEvent_GetRect,(self,) + _args, _kwargs) + val = windows3c.wxCalculateLayoutEvent_GetRect(self, *_args, **_kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxCalculateLayoutEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCalculateLayoutEvent(wxCalculateLayoutEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxCalculateLayoutEvent,_args,_kwargs) + self.this = windows3c.new_wxCalculateLayoutEvent(*_args,**_kwargs) self.thisown = 1 @@ -208,35 +208,35 @@ class wxSashLayoutWindowPtr(wxSashWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windows3c.wxSashLayoutWindow_Create,(self,) + _args, _kwargs) + val = windows3c.wxSashLayoutWindow_Create(self, *_args, **_kwargs) return val def GetAlignment(self, *_args, **_kwargs): - val = apply(windows3c.wxSashLayoutWindow_GetAlignment,(self,) + _args, _kwargs) + val = windows3c.wxSashLayoutWindow_GetAlignment(self, *_args, **_kwargs) return val def GetOrientation(self, *_args, **_kwargs): - val = apply(windows3c.wxSashLayoutWindow_GetOrientation,(self,) + _args, _kwargs) + val = windows3c.wxSashLayoutWindow_GetOrientation(self, *_args, **_kwargs) return val def SetAlignment(self, *_args, **_kwargs): - val = apply(windows3c.wxSashLayoutWindow_SetAlignment,(self,) + _args, _kwargs) + val = windows3c.wxSashLayoutWindow_SetAlignment(self, *_args, **_kwargs) return val def SetDefaultSize(self, *_args, **_kwargs): - val = apply(windows3c.wxSashLayoutWindow_SetDefaultSize,(self,) + _args, _kwargs) + val = windows3c.wxSashLayoutWindow_SetDefaultSize(self, *_args, **_kwargs) return val def SetOrientation(self, *_args, **_kwargs): - val = apply(windows3c.wxSashLayoutWindow_SetOrientation,(self,) + _args, _kwargs) + val = windows3c.wxSashLayoutWindow_SetOrientation(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxSashLayoutWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxSashLayoutWindow(wxSashLayoutWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxSashLayoutWindow,_args,_kwargs) + self.this = windows3c.new_wxSashLayoutWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreSashLayoutWindow(*_args,**_kwargs): - val = wxSashLayoutWindowPtr(apply(windows3c.new_wxPreSashLayoutWindow,_args,_kwargs)) + val = wxSashLayoutWindowPtr(windows3c.new_wxPreSashLayoutWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -253,19 +253,19 @@ class wxLayoutAlgorithmPtr(wxObjectPtr): except: pass def LayoutMDIFrame(self, *_args, **_kwargs): - val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs) + val = windows3c.wxLayoutAlgorithm_LayoutMDIFrame(self, *_args, **_kwargs) return val def LayoutFrame(self, *_args, **_kwargs): - val = apply(windows3c.wxLayoutAlgorithm_LayoutFrame,(self,) + _args, _kwargs) + val = windows3c.wxLayoutAlgorithm_LayoutFrame(self, *_args, **_kwargs) return val def LayoutWindow(self, *_args, **_kwargs): - val = apply(windows3c.wxLayoutAlgorithm_LayoutWindow,(self,) + _args, _kwargs) + val = windows3c.wxLayoutAlgorithm_LayoutWindow(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxLayoutAlgorithm instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxLayoutAlgorithm(wxLayoutAlgorithmPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxLayoutAlgorithm,_args,_kwargs) + self.this = windows3c.new_wxLayoutAlgorithm(*_args,**_kwargs) self.thisown = 1 @@ -276,23 +276,23 @@ class wxPopupWindowPtr(wxWindowPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(windows3c.wxPopupWindow_Create,(self,) + _args, _kwargs) + val = windows3c.wxPopupWindow_Create(self, *_args, **_kwargs) return val def Position(self, *_args, **_kwargs): - val = apply(windows3c.wxPopupWindow_Position,(self,) + _args, _kwargs) + val = windows3c.wxPopupWindow_Position(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPopupWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPopupWindow(wxPopupWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxPopupWindow,_args,_kwargs) + self.this = windows3c.new_wxPopupWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPrePopupWindow(*_args,**_kwargs): - val = wxPopupWindowPtr(apply(windows3c.new_wxPrePopupWindow,_args,_kwargs)) + val = wxPopupWindowPtr(windows3c.new_wxPrePopupWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -303,19 +303,19 @@ class wxPopupTransientWindowPtr(wxPopupWindowPtr): self.this = this self.thisown = 0 def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(windows3c.wxPopupTransientWindow__setCallbackInfo,(self,) + _args, _kwargs) + val = windows3c.wxPopupTransientWindow__setCallbackInfo(self, *_args, **_kwargs) return val def Popup(self, *_args, **_kwargs): - val = apply(windows3c.wxPopupTransientWindow_Popup,(self,) + _args, _kwargs) + val = windows3c.wxPopupTransientWindow_Popup(self, *_args, **_kwargs) return val def Dismiss(self, *_args, **_kwargs): - val = apply(windows3c.wxPopupTransientWindow_Dismiss,(self,) + _args, _kwargs) + val = windows3c.wxPopupTransientWindow_Dismiss(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPopupTransientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPopupTransientWindow(wxPopupTransientWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxPopupTransientWindow,_args,_kwargs) + self.this = windows3c.new_wxPopupTransientWindow(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPopupTransientWindow) self._setOORInfo(self) @@ -323,7 +323,7 @@ class wxPopupTransientWindow(wxPopupTransientWindowPtr): def wxPrePopupTransientWindow(*_args,**_kwargs): - val = wxPopupTransientWindowPtr(apply(windows3c.new_wxPrePopupTransientWindow,_args,_kwargs)) + val = wxPopupTransientWindowPtr(windows3c.new_wxPrePopupTransientWindow(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -334,16 +334,16 @@ class wxTipWindowPtr(wxPopupTransientWindowPtr): self.this = this self.thisown = 0 def SetBoundingRect(self, *_args, **_kwargs): - val = apply(windows3c.wxTipWindow_SetBoundingRect,(self,) + _args, _kwargs) + val = windows3c.wxTipWindow_SetBoundingRect(self, *_args, **_kwargs) return val def Close(self, *_args, **_kwargs): - val = apply(windows3c.wxTipWindow_Close,(self,) + _args, _kwargs) + val = windows3c.wxTipWindow_Close(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxTipWindow(wxTipWindowPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(windows3c.new_wxTipWindow,_args,_kwargs) + self.this = windows3c.new_wxTipWindow(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) diff --git a/wxPython/src/msw/wizard.cpp b/wxPython/src/msw/wizard.cpp index 4dcad1e649..e6fdabed39 100644 --- a/wxPython/src/msw/wizard.cpp +++ b/wxPython/src/msw/wizard.cpp @@ -1640,7 +1640,7 @@ static void *SwigwxWizardTowxObject(void *ptr) { return (void *) dest; } -#define new_wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +#define new_wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) static PyObject *_wrap_new_wxWizard(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxWizard * _result; @@ -1649,16 +1649,17 @@ static PyObject *_wrap_new_wxWizard(PyObject *self, PyObject *args, PyObject *kw wxString * _arg2 = (wxString *) &wxEmptyString; wxBitmap * _arg3 = (wxBitmap *) &wxNullBitmap; wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition; + long _arg5 = (long ) wxDEFAULT_DIALOG_STYLE; PyObject * _argo0 = 0; PyObject * _obj2 = 0; PyObject * _argo3 = 0; wxPoint temp; PyObject * _obj4 = 0; - char *_kwnames[] = { "parent","id","title","bitmap","pos", NULL }; + char *_kwnames[] = { "parent","id","title","bitmap","pos","style", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOO:new_wxWizard",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_obj4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOOl:new_wxWizard",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_obj4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1687,7 +1688,7 @@ static PyObject *_wrap_new_wxWizard(PyObject *self, PyObject *args, PyObject *kw } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxWizard *)new_wxWizard(_arg0,_arg1,*_arg2,*_arg3,*_arg4); + _result = (wxWizard *)new_wxWizard(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1994,6 +1995,63 @@ static PyObject *_wrap_wxWizard_FitToPage(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxWizard_GetPageAreaSizer(_swigobj) (_swigobj->GetPageAreaSizer()) +static PyObject *_wrap_wxWizard_GetPageAreaSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _result; + wxWizard * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizard_GetPageAreaSizer",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizard_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizard_GetPageAreaSizer. Expected _wxWizard_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxSizer *)wxWizard_GetPageAreaSizer(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxSizer(_result); } + return _resultobj; +} + +#define wxWizard_SetBorder(_swigobj,_swigarg0) (_swigobj->SetBorder(_swigarg0)) +static PyObject *_wrap_wxWizard_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWizard * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","border", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWizard_SetBorder",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizard_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizard_SetBorder. Expected _wxWizard_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxWizard_SetBorder(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWizard_IsRunning(_swigobj) (_swigobj->IsRunning()) static PyObject *_wrap_wxWizard_IsRunning(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2141,6 +2199,8 @@ static PyMethodDef wizardcMethods[] = { { "wxWizard_HasNextPage", (PyCFunction) _wrap_wxWizard_HasNextPage, METH_VARARGS | METH_KEYWORDS }, { "wxWizard_ShowPage", (PyCFunction) _wrap_wxWizard_ShowPage, METH_VARARGS | METH_KEYWORDS }, { "wxWizard_IsRunning", (PyCFunction) _wrap_wxWizard_IsRunning, METH_VARARGS | METH_KEYWORDS }, + { "wxWizard_SetBorder", (PyCFunction) _wrap_wxWizard_SetBorder, METH_VARARGS | METH_KEYWORDS }, + { "wxWizard_GetPageAreaSizer", (PyCFunction) _wrap_wxWizard_GetPageAreaSizer, METH_VARARGS | METH_KEYWORDS }, { "wxWizard_FitToPage", (PyCFunction) _wrap_wxWizard_FitToPage, METH_VARARGS | METH_KEYWORDS }, { "wxWizard_GetPageSize", (PyCFunction) _wrap_wxWizard_GetPageSize, METH_VARARGS | METH_KEYWORDS }, { "wxWizard_SetPageSize", (PyCFunction) _wrap_wxWizard_SetPageSize, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/wizard.py b/wxPython/src/msw/wizard.py index 845cdb939f..bd385ce0b9 100644 --- a/wxPython/src/msw/wizard.py +++ b/wxPython/src/msw/wizard.py @@ -41,16 +41,16 @@ class wxWizardEventPtr(wxNotifyEventPtr): self.this = this self.thisown = 0 def GetDirection(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardEvent_GetDirection,(self,) + _args, _kwargs) + val = wizardc.wxWizardEvent_GetDirection(self, *_args, **_kwargs) return val def GetPage(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardEvent_GetPage,(self,) + _args, _kwargs) + val = wizardc.wxWizardEvent_GetPage(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWizardEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWizardEvent(wxWizardEventPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(wizardc.new_wxWizardEvent,_args,_kwargs) + self.this = wizardc.new_wxWizardEvent(*_args,**_kwargs) self.thisown = 1 @@ -61,20 +61,20 @@ class wxWizardPagePtr(wxPanelPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardPage_Create,(self,) + _args, _kwargs) + val = wizardc.wxWizardPage_Create(self, *_args, **_kwargs) return val def GetPrev(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardPage_GetPrev,(self,) + _args, _kwargs) + val = wizardc.wxWizardPage_GetPrev(self, *_args, **_kwargs) return val def GetNext(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardPage_GetNext,(self,) + _args, _kwargs) + val = wizardc.wxWizardPage_GetNext(self, *_args, **_kwargs) return val def GetBitmap(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardPage_GetBitmap,(self,) + _args, _kwargs) + val = wizardc.wxWizardPage_GetBitmap(self, *_args, **_kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWizardPage(wxWizardPagePtr): def __init__(self,this): self.this = this @@ -87,73 +87,73 @@ class wxPyWizardPagePtr(wxWizardPagePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_Create,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_Create(self, *_args, **_kwargs) return val def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage__setCallbackInfo,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage__setCallbackInfo(self, *_args, **_kwargs) return val def base_DoMoveWindow(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoMoveWindow,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoMoveWindow(self, *_args, **_kwargs) return val def base_DoSetSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoSetSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoSetSize(self, *_args, **_kwargs) return val def base_DoSetClientSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoSetClientSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoSetClientSize(self, *_args, **_kwargs) return val def base_DoSetVirtualSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoSetVirtualSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoSetVirtualSize(self, *_args, **_kwargs) return val def base_DoGetSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoGetSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoGetSize(self, *_args, **_kwargs) return val def base_DoGetClientSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoGetClientSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoGetClientSize(self, *_args, **_kwargs) return val def base_DoGetPosition(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoGetPosition,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoGetPosition(self, *_args, **_kwargs) return val def base_DoGetVirtualSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoGetVirtualSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoGetVirtualSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_DoGetBestSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_DoGetBestSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_DoGetBestSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_InitDialog(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_InitDialog,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_InitDialog(self, *_args, **_kwargs) return val def base_TransferDataToWindow(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_TransferDataToWindow,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_TransferDataToWindow(self, *_args, **_kwargs) return val def base_TransferDataFromWindow(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_TransferDataFromWindow,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_TransferDataFromWindow(self, *_args, **_kwargs) return val def base_Validate(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_Validate,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_Validate(self, *_args, **_kwargs) return val def base_AcceptsFocus(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_AcceptsFocus,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_AcceptsFocus(self, *_args, **_kwargs) return val def base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_AcceptsFocusFromKeyboard,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs) return val def base_GetMaxSize(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_GetMaxSize,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_GetMaxSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def base_AddChild(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_AddChild,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_AddChild(self, *_args, **_kwargs) return val def base_RemoveChild(self, *_args, **_kwargs): - val = apply(wizardc.wxPyWizardPage_base_RemoveChild,(self,) + _args, _kwargs) + val = wizardc.wxPyWizardPage_base_RemoveChild(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyWizardPage(wxPyWizardPagePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(wizardc.new_wxPyWizardPage,_args,_kwargs) + self.this = wizardc.new_wxPyWizardPage(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyWizardPage) self._setOORInfo(self) @@ -161,7 +161,7 @@ class wxPyWizardPage(wxPyWizardPagePtr): def wxPrePyWizardPage(*_args,**_kwargs): - val = wxPyWizardPagePtr(apply(wizardc.new_wxPrePyWizardPage,_args,_kwargs)) + val = wxPyWizardPagePtr(wizardc.new_wxPrePyWizardPage(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -172,26 +172,26 @@ class wxWizardPageSimplePtr(wxWizardPagePtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardPageSimple_Create,(self,) + _args, _kwargs) + val = wizardc.wxWizardPageSimple_Create(self, *_args, **_kwargs) return val def SetPrev(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardPageSimple_SetPrev,(self,) + _args, _kwargs) + val = wizardc.wxWizardPageSimple_SetPrev(self, *_args, **_kwargs) return val def SetNext(self, *_args, **_kwargs): - val = apply(wizardc.wxWizardPageSimple_SetNext,(self,) + _args, _kwargs) + val = wizardc.wxWizardPageSimple_SetNext(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWizardPageSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWizardPageSimple(wxWizardPageSimplePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(wizardc.new_wxWizardPageSimple,_args,_kwargs) + self.this = wizardc.new_wxWizardPageSimple(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreWizardPageSimple(*_args,**_kwargs): - val = wxWizardPageSimplePtr(apply(wizardc.new_wxPreWizardPageSimple,_args,_kwargs)) + val = wxWizardPageSimplePtr(wizardc.new_wxPreWizardPageSimple(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val @@ -202,51 +202,57 @@ class wxWizardPtr(wxDialogPtr): self.this = this self.thisown = 0 def Create(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_Create,(self,) + _args, _kwargs) + val = wizardc.wxWizard_Create(self, *_args, **_kwargs) return val def Init(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_Init,(self,) + _args, _kwargs) + val = wizardc.wxWizard_Init(self, *_args, **_kwargs) return val def RunWizard(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_RunWizard,(self,) + _args, _kwargs) + val = wizardc.wxWizard_RunWizard(self, *_args, **_kwargs) return val def GetCurrentPage(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_GetCurrentPage,(self,) + _args, _kwargs) + val = wizardc.wxWizard_GetCurrentPage(self, *_args, **_kwargs) return val def SetPageSize(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_SetPageSize,(self,) + _args, _kwargs) + val = wizardc.wxWizard_SetPageSize(self, *_args, **_kwargs) return val def GetPageSize(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_GetPageSize,(self,) + _args, _kwargs) + val = wizardc.wxWizard_GetPageSize(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def FitToPage(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_FitToPage,(self,) + _args, _kwargs) + val = wizardc.wxWizard_FitToPage(self, *_args, **_kwargs) + return val + def GetPageAreaSizer(self, *_args, **_kwargs): + val = wizardc.wxWizard_GetPageAreaSizer(self, *_args, **_kwargs) + return val + def SetBorder(self, *_args, **_kwargs): + val = wizardc.wxWizard_SetBorder(self, *_args, **_kwargs) return val def IsRunning(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_IsRunning,(self,) + _args, _kwargs) + val = wizardc.wxWizard_IsRunning(self, *_args, **_kwargs) return val def ShowPage(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_ShowPage,(self,) + _args, _kwargs) + val = wizardc.wxWizard_ShowPage(self, *_args, **_kwargs) return val def HasNextPage(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_HasNextPage,(self,) + _args, _kwargs) + val = wizardc.wxWizard_HasNextPage(self, *_args, **_kwargs) return val def HasPrevPage(self, *_args, **_kwargs): - val = apply(wizardc.wxWizard_HasPrevPage,(self,) + _args, _kwargs) + val = wizardc.wxWizard_HasPrevPage(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxWizard(wxWizardPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(wizardc.new_wxWizard,_args,_kwargs) + self.this = wizardc.new_wxWizard(*_args,**_kwargs) self.thisown = 1 self._setOORInfo(self) def wxPreWizard(*_args,**_kwargs): - val = wxWizardPtr(apply(wizardc.new_wxPreWizard,_args,_kwargs)) + val = wxWizardPtr(wizardc.new_wxPreWizard(*_args,**_kwargs)) val.thisown = 1 val._setOORInfo(val) return val diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index 263cd864db..c3fcb4eac2 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -83,6 +83,18 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } +#if ! wxUSE_HOTKEY +enum wxHotkeyModifier +{ + wxMOD_NONE = 0, + wxMOD_ALT = 1, + wxMOD_CONTROL = 2, + wxMOD_SHIFT = 4, + wxMOD_WIN = 8 +}; +#define wxEVT_HOTKEY 9999 +#endif + #include @@ -1090,34 +1102,6 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxPyApp_GetAuto3D(_swigobj) (_swigobj->GetAuto3D()) -static PyObject *_wrap_wxPyApp_GetAuto3D(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxPyApp * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetAuto3D",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetAuto3D. Expected _wxPyApp_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPyApp_GetAuto3D(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - #define wxPyApp_GetClassName(_swigobj) (_swigobj->GetClassName()) static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1542,37 +1526,6 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args, PyObje return _resultobj; } -#define wxPyApp_SetAuto3D(_swigobj,_swigarg0) (_swigobj->SetAuto3D(_swigarg0)) -static PyObject *_wrap_wxPyApp_SetAuto3D(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxPyApp * _arg0; - bool _arg1; - PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","auto3D", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyApp_SetAuto3D",_kwnames,&_argo0,&tempbool1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetAuto3D. Expected _wxPyApp_p."); - return NULL; - } - } - _arg1 = (bool ) tempbool1; -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPyApp_SetAuto3D(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - #define wxPyApp_SetClassName(_swigobj,_swigarg0) (_swigobj->SetClassName(_swigarg0)) static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2102,7 +2055,6 @@ static PyMethodDef wxcMethods[] = { { "wxPyApp_SetPrintMode", (PyCFunction) _wrap_wxPyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetExitOnFrameDelete", (PyCFunction) _wrap_wxPyApp_SetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetClassName", (PyCFunction) _wrap_wxPyApp_SetClassName, METH_VARARGS | METH_KEYWORDS }, - { "wxPyApp_SetAuto3D", (PyCFunction) _wrap_wxPyApp_SetAuto3D, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetAppName", (PyCFunction) _wrap_wxPyApp_SetAppName, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_Yield", (PyCFunction) _wrap_wxPyApp_Yield, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_ProcessIdle", (PyCFunction) _wrap_wxPyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS }, @@ -2117,7 +2069,6 @@ static PyMethodDef wxcMethods[] = { { "wxPyApp_GetPrintMode", (PyCFunction) _wrap_wxPyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetExitOnFrameDelete", (PyCFunction) _wrap_wxPyApp_GetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetClassName", (PyCFunction) _wrap_wxPyApp_GetClassName, METH_VARARGS | METH_KEYWORDS }, - { "wxPyApp_GetAuto3D", (PyCFunction) _wrap_wxPyApp_GetAuto3D, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetAppName", (PyCFunction) _wrap_wxPyApp_GetAppName, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp__setCallbackInfo", (PyCFunction) _wrap_wxPyApp__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { "delete_wxPyApp", (PyCFunction) _wrap_delete_wxPyApp, METH_VARARGS | METH_KEYWORDS }, @@ -2303,6 +2254,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxFRAME_FLOAT_ON_PARENT", PyInt_FromLong((long) wxFRAME_FLOAT_ON_PARENT)); PyDict_SetItemString(d,"wxFRAME_NO_WINDOW_MENU", PyInt_FromLong((long) wxFRAME_NO_WINDOW_MENU)); PyDict_SetItemString(d,"wxFRAME_NO_TASKBAR", PyInt_FromLong((long) wxFRAME_NO_TASKBAR)); + PyDict_SetItemString(d,"wxFRAME_SHAPED", PyInt_FromLong((long) wxFRAME_SHAPED)); PyDict_SetItemString(d,"wxED_CLIENT_MARGIN", PyInt_FromLong((long) wxED_CLIENT_MARGIN)); PyDict_SetItemString(d,"wxED_BUTTONS_BOTTOM", PyInt_FromLong((long) wxED_BUTTONS_BOTTOM)); PyDict_SetItemString(d,"wxED_BUTTONS_RIGHT", PyInt_FromLong((long) wxED_BUTTONS_RIGHT)); @@ -2312,15 +2264,6 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxCLIP_SIBLINGS", PyInt_FromLong((long) wxCLIP_SIBLINGS)); PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED)); PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE)); - PyDict_SetItemString(d,"wxTB_HORIZONTAL", PyInt_FromLong((long) wxTB_HORIZONTAL)); - PyDict_SetItemString(d,"wxTB_VERTICAL", PyInt_FromLong((long) wxTB_VERTICAL)); - PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS)); - PyDict_SetItemString(d,"wxTB_FLAT", PyInt_FromLong((long) wxTB_FLAT)); - PyDict_SetItemString(d,"wxTB_DOCKABLE", PyInt_FromLong((long) wxTB_DOCKABLE)); - PyDict_SetItemString(d,"wxTB_NOICONS", PyInt_FromLong((long) wxTB_NOICONS)); - PyDict_SetItemString(d,"wxTB_TEXT", PyInt_FromLong((long) wxTB_TEXT)); - PyDict_SetItemString(d,"wxTB_NODIVIDER", PyInt_FromLong((long) wxTB_NODIVIDER)); - PyDict_SetItemString(d,"wxTB_NOALIGN", PyInt_FromLong((long) wxTB_NOALIGN)); PyDict_SetItemString(d,"wxCOLOURED", PyInt_FromLong((long) wxCOLOURED)); PyDict_SetItemString(d,"wxFIXED_LENGTH", PyInt_FromLong((long) wxFIXED_LENGTH)); PyDict_SetItemString(d,"wxALIGN_LEFT", PyInt_FromLong((long) wxALIGN_LEFT)); @@ -2345,24 +2288,6 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxLB_HSCROLL", PyInt_FromLong((long) wxLB_HSCROLL)); PyDict_SetItemString(d,"wxPROCESS_ENTER", PyInt_FromLong((long) wxPROCESS_ENTER)); PyDict_SetItemString(d,"wxPASSWORD", PyInt_FromLong((long) wxPASSWORD)); - PyDict_SetItemString(d,"wxTE_READONLY", PyInt_FromLong((long) wxTE_READONLY)); - PyDict_SetItemString(d,"wxTE_MULTILINE", PyInt_FromLong((long) wxTE_MULTILINE)); - PyDict_SetItemString(d,"wxTE_PROCESS_TAB", PyInt_FromLong((long) wxTE_PROCESS_TAB)); - PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH)); - PyDict_SetItemString(d,"wxTE_RICH2", PyInt_FromLong((long) wxTE_RICH2)); - PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL)); - PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL)); - PyDict_SetItemString(d,"wxTE_PROCESS_ENTER", PyInt_FromLong((long) wxTE_PROCESS_ENTER)); - PyDict_SetItemString(d,"wxTE_PASSWORD", PyInt_FromLong((long) wxTE_PASSWORD)); - PyDict_SetItemString(d,"wxTE_AUTO_URL", PyInt_FromLong((long) wxTE_AUTO_URL)); - PyDict_SetItemString(d,"wxTE_NOHIDESEL", PyInt_FromLong((long) wxTE_NOHIDESEL)); - PyDict_SetItemString(d,"wxTE_DONTWRAP", PyInt_FromLong((long) wxTE_DONTWRAP)); - PyDict_SetItemString(d,"wxTE_LINEWRAP", PyInt_FromLong((long) wxTE_LINEWRAP)); - PyDict_SetItemString(d,"wxTE_WORDWRAP", PyInt_FromLong((long) wxTE_WORDWRAP)); - PyDict_SetItemString(d,"wxTE_LEFT", PyInt_FromLong((long) wxTE_LEFT)); - PyDict_SetItemString(d,"wxTE_RIGHT", PyInt_FromLong((long) wxTE_RIGHT)); - PyDict_SetItemString(d,"wxTE_CENTER", PyInt_FromLong((long) wxTE_CENTER)); - PyDict_SetItemString(d,"wxTE_CENTRE", PyInt_FromLong((long) wxTE_CENTRE)); PyDict_SetItemString(d,"wxCB_SIMPLE", PyInt_FromLong((long) wxCB_SIMPLE)); PyDict_SetItemString(d,"wxCB_DROPDOWN", PyInt_FromLong((long) wxCB_DROPDOWN)); PyDict_SetItemString(d,"wxCB_SORT", PyInt_FromLong((long) wxCB_SORT)); @@ -2398,18 +2323,6 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxBU_RIGHT", PyInt_FromLong((long) wxBU_RIGHT)); PyDict_SetItemString(d,"wxBU_BOTTOM", PyInt_FromLong((long) wxBU_BOTTOM)); PyDict_SetItemString(d,"wxBU_EXACTFIT", PyInt_FromLong((long) wxBU_EXACTFIT)); - PyDict_SetItemString(d,"wxSP_VERTICAL", PyInt_FromLong((long) wxSP_VERTICAL)); - PyDict_SetItemString(d,"wxSP_HORIZONTAL", PyInt_FromLong((long) wxSP_HORIZONTAL)); - PyDict_SetItemString(d,"wxSP_ARROW_KEYS", PyInt_FromLong((long) wxSP_ARROW_KEYS)); - PyDict_SetItemString(d,"wxSP_WRAP", PyInt_FromLong((long) wxSP_WRAP)); - PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER)); - PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D)); - PyDict_SetItemString(d,"wxSP_3DSASH", PyInt_FromLong((long) wxSP_3DSASH)); - PyDict_SetItemString(d,"wxSP_3DBORDER", PyInt_FromLong((long) wxSP_3DBORDER)); - PyDict_SetItemString(d,"wxSP_FULLSASH", PyInt_FromLong((long) wxSP_FULLSASH)); - PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER)); - PyDict_SetItemString(d,"wxSP_LIVE_UPDATE", PyInt_FromLong((long) wxSP_LIVE_UPDATE)); - PyDict_SetItemString(d,"wxSP_PERMIT_UNSPLIT", PyInt_FromLong((long) wxSP_PERMIT_UNSPLIT)); PyDict_SetItemString(d,"wxFLOOD_SURFACE", PyInt_FromLong((long) wxFLOOD_SURFACE)); PyDict_SetItemString(d,"wxFLOOD_BORDER", PyInt_FromLong((long) wxFLOOD_BORDER)); PyDict_SetItemString(d,"wxODDEVEN_RULE", PyInt_FromLong((long) wxODDEVEN_RULE)); @@ -2481,6 +2394,18 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxID_FIND", PyInt_FromLong((long) wxID_FIND)); PyDict_SetItemString(d,"wxID_DUPLICATE", PyInt_FromLong((long) wxID_DUPLICATE)); PyDict_SetItemString(d,"wxID_SELECTALL", PyInt_FromLong((long) wxID_SELECTALL)); + PyDict_SetItemString(d,"wxID_DELETE", PyInt_FromLong((long) wxID_DELETE)); + PyDict_SetItemString(d,"wxID_REPLACE", PyInt_FromLong((long) wxID_REPLACE)); + PyDict_SetItemString(d,"wxID_REPLACE_ALL", PyInt_FromLong((long) wxID_REPLACE_ALL)); + PyDict_SetItemString(d,"wxID_PROPERTIES", PyInt_FromLong((long) wxID_PROPERTIES)); + PyDict_SetItemString(d,"wxID_VIEW_DETAILS", PyInt_FromLong((long) wxID_VIEW_DETAILS)); + PyDict_SetItemString(d,"wxID_VIEW_LARGEICONS", PyInt_FromLong((long) wxID_VIEW_LARGEICONS)); + PyDict_SetItemString(d,"wxID_VIEW_SMALLICONS", PyInt_FromLong((long) wxID_VIEW_SMALLICONS)); + PyDict_SetItemString(d,"wxID_VIEW_LIST", PyInt_FromLong((long) wxID_VIEW_LIST)); + PyDict_SetItemString(d,"wxID_VIEW_SORTDATE", PyInt_FromLong((long) wxID_VIEW_SORTDATE)); + PyDict_SetItemString(d,"wxID_VIEW_SORTNAME", PyInt_FromLong((long) wxID_VIEW_SORTNAME)); + PyDict_SetItemString(d,"wxID_VIEW_SORTSIZE", PyInt_FromLong((long) wxID_VIEW_SORTSIZE)); + PyDict_SetItemString(d,"wxID_VIEW_SORTTYPE", PyInt_FromLong((long) wxID_VIEW_SORTTYPE)); PyDict_SetItemString(d,"wxID_FILE1", PyInt_FromLong((long) wxID_FILE1)); PyDict_SetItemString(d,"wxID_FILE2", PyInt_FromLong((long) wxID_FILE2)); PyDict_SetItemString(d,"wxID_FILE3", PyInt_FromLong((long) wxID_FILE3)); @@ -2545,11 +2470,6 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxSHRINK", PyInt_FromLong((long) wxSHRINK)); PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW)); PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND)); - PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH)); - PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT)); - PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT)); - PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM)); - PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE)); PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL)); PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL)); PyDict_SetItemString(d,"wxJOYSTICK1", PyInt_FromLong((long) wxJOYSTICK1)); @@ -2562,6 +2482,9 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxWS_EX_VALIDATE_RECURSIVELY", PyInt_FromLong((long) wxWS_EX_VALIDATE_RECURSIVELY)); PyDict_SetItemString(d,"wxWS_EX_BLOCK_EVENTS", PyInt_FromLong((long) wxWS_EX_BLOCK_EVENTS)); PyDict_SetItemString(d,"wxWS_EX_TRANSIENT", PyInt_FromLong((long) wxWS_EX_TRANSIENT)); + PyDict_SetItemString(d,"wxWS_EX_THEMED_BACKGROUND", PyInt_FromLong((long) wxWS_EX_THEMED_BACKGROUND)); + PyDict_SetItemString(d,"wxWS_EX_PROCESS_IDLE", PyInt_FromLong((long) wxWS_EX_PROCESS_IDLE)); + PyDict_SetItemString(d,"wxWS_EX_PROCESS_UI_UPDATES", PyInt_FromLong((long) wxWS_EX_PROCESS_UI_UPDATES)); PyDict_SetItemString(d,"wxMM_TEXT", PyInt_FromLong((long) wxMM_TEXT)); PyDict_SetItemString(d,"wxMM_LOMETRIC", PyInt_FromLong((long) wxMM_LOMETRIC)); PyDict_SetItemString(d,"wxMM_HIMETRIC", PyInt_FromLong((long) wxMM_HIMETRIC)); @@ -2897,6 +2820,14 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxHT_WINDOW_HORZ_SCROLLBAR", PyInt_FromLong((long) wxHT_WINDOW_HORZ_SCROLLBAR)); PyDict_SetItemString(d,"wxHT_WINDOW_CORNER", PyInt_FromLong((long) wxHT_WINDOW_CORNER)); PyDict_SetItemString(d,"wxHT_MAX", PyInt_FromLong((long) wxHT_MAX)); + PyDict_SetItemString(d,"wxMOD_NONE", PyInt_FromLong((long) wxMOD_NONE)); + PyDict_SetItemString(d,"wxMOD_ALT", PyInt_FromLong((long) wxMOD_ALT)); + PyDict_SetItemString(d,"wxMOD_CONTROL", PyInt_FromLong((long) wxMOD_CONTROL)); + PyDict_SetItemString(d,"wxMOD_SHIFT", PyInt_FromLong((long) wxMOD_SHIFT)); + PyDict_SetItemString(d,"wxMOD_WIN", PyInt_FromLong((long) wxMOD_WIN)); + PyDict_SetItemString(d,"wxUPDATE_UI_NONE", PyInt_FromLong((long) wxUPDATE_UI_NONE)); + PyDict_SetItemString(d,"wxUPDATE_UI_RECURSE", PyInt_FromLong((long) wxUPDATE_UI_RECURSE)); + PyDict_SetItemString(d,"wxUPDATE_UI_FROMIDLE", PyInt_FromLong((long) wxUPDATE_UI_FROMIDLE)); PyDict_SetItemString(d,"wxEVT_NULL", PyInt_FromLong((long) wxEVT_NULL)); PyDict_SetItemString(d,"wxEVT_FIRST", PyInt_FromLong((long) wxEVT_FIRST)); PyDict_SetItemString(d,"wxEVT_COMMAND_BUTTON_CLICKED", PyInt_FromLong((long) wxEVT_COMMAND_BUTTON_CLICKED)); @@ -2954,6 +2885,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_KEY_DOWN", PyInt_FromLong((long) wxEVT_KEY_DOWN)); PyDict_SetItemString(d,"wxEVT_KEY_UP", PyInt_FromLong((long) wxEVT_KEY_UP)); PyDict_SetItemString(d,"wxEVT_CHAR_HOOK", PyInt_FromLong((long) wxEVT_CHAR_HOOK)); + PyDict_SetItemString(d,"wxEVT_HOTKEY", PyInt_FromLong((long) wxEVT_HOTKEY)); PyDict_SetItemString(d,"wxEVT_SCROLL_TOP", PyInt_FromLong((long) wxEVT_SCROLL_TOP)); PyDict_SetItemString(d,"wxEVT_SCROLL_BOTTOM", PyInt_FromLong((long) wxEVT_SCROLL_BOTTOM)); PyDict_SetItemString(d,"wxEVT_SCROLL_LINEUP", PyInt_FromLong((long) wxEVT_SCROLL_LINEUP)); @@ -2973,6 +2905,8 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_SCROLLWIN_THUMBRELEASE", PyInt_FromLong((long) wxEVT_SCROLLWIN_THUMBRELEASE)); PyDict_SetItemString(d,"wxEVT_SIZE", PyInt_FromLong((long) wxEVT_SIZE)); PyDict_SetItemString(d,"wxEVT_MOVE", PyInt_FromLong((long) wxEVT_MOVE)); + PyDict_SetItemString(d,"wxEVT_SIZING", PyInt_FromLong((long) wxEVT_SIZING)); + PyDict_SetItemString(d,"wxEVT_MOVING", PyInt_FromLong((long) wxEVT_MOVING)); PyDict_SetItemString(d,"wxEVT_CLOSE_WINDOW", PyInt_FromLong((long) wxEVT_CLOSE_WINDOW)); PyDict_SetItemString(d,"wxEVT_END_SESSION", PyInt_FromLong((long) wxEVT_END_SESSION)); PyDict_SetItemString(d,"wxEVT_QUERY_END_SESSION", PyInt_FromLong((long) wxEVT_QUERY_END_SESSION)); @@ -3017,7 +2951,6 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_COMMAND_ENTER", PyInt_FromLong((long) wxEVT_COMMAND_ENTER)); PyDict_SetItemString(d,"wxEVT_NAVIGATION_KEY", PyInt_FromLong((long) wxEVT_NAVIGATION_KEY)); PyDict_SetItemString(d,"wxEVT_TIMER", PyInt_FromLong((long) wxEVT_TIMER)); - PyDict_SetItemString(d,"__version__", PyString_FromString("0.0.0")); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxDefaultPosition",_wrap_wxDefaultPosition_get, _wrap_wxDefaultPosition_set); SWIG_addvarlink(SWIG_globals,"wxDefaultSize",_wrap_wxDefaultSize_get, _wrap_wxDefaultSize_set); @@ -3062,17 +2995,12 @@ SWIGEXPORT(void) initwxc() { initfontsc(); + // Although these are redfined in __version__ they need to be here too so + // that an assert can be done to ensure that the wxPython and the wxWindows + // versions match. PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION )); PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long)wxMINOR_VERSION )); - PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long)wxRELEASE_NUMBER )); - PyDict_SetItemString(d,"wxVERSION_NUMBER", PyInt_FromLong((long)wxVERSION_NUMBER )); -#if wxUSE_UNICODE - wxString tempStr(wxVERSION_STRING); - PyDict_SetItemString(d,"wxVERSION_STRING", PyUnicode_FromWideChar(tempStr.c_str(), tempStr.Len())); -#else - PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING)); -#endif - + PyDict_SetItemString(d,"wxRELEASE_VERSION", PyInt_FromLong((long)wxRELEASE_NUMBER )); { int i; diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index 04e8dec0ae..f69a9cdb32 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -53,88 +53,82 @@ class wxPyAppPtr(wxEvtHandlerPtr): except: pass def _setCallbackInfo(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp__setCallbackInfo,(self,) + _args, _kwargs) + val = wxc.wxPyApp__setCallbackInfo(self, *_args, **_kwargs) return val def GetAppName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetAppName,(self,) + _args, _kwargs) - return val - def GetAuto3D(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetAuto3D,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetAppName(self, *_args, **_kwargs) return val def GetClassName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetClassName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetClassName(self, *_args, **_kwargs) return val def GetExitOnFrameDelete(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetExitOnFrameDelete,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetExitOnFrameDelete(self, *_args, **_kwargs) return val def GetPrintMode(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetPrintMode,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetPrintMode(self, *_args, **_kwargs) return val def GetTopWindow(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetTopWindow,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetTopWindow(self, *_args, **_kwargs) return val def GetVendorName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetVendorName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetVendorName(self, *_args, **_kwargs) return val def GetUseBestVisual(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetUseBestVisual,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetUseBestVisual(self, *_args, **_kwargs) return val def Dispatch(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_Dispatch,(self,) + _args, _kwargs) + val = wxc.wxPyApp_Dispatch(self, *_args, **_kwargs) return val def ExitMainLoop(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_ExitMainLoop,(self,) + _args, _kwargs) + val = wxc.wxPyApp_ExitMainLoop(self, *_args, **_kwargs) return val def Initialized(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_Initialized,(self,) + _args, _kwargs) + val = wxc.wxPyApp_Initialized(self, *_args, **_kwargs) return val def MainLoop(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_MainLoop,(self,) + _args, _kwargs) + val = wxc.wxPyApp_MainLoop(self, *_args, **_kwargs) return val def Pending(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_Pending,(self,) + _args, _kwargs) + val = wxc.wxPyApp_Pending(self, *_args, **_kwargs) return val def ProcessIdle(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_ProcessIdle,(self,) + _args, _kwargs) + val = wxc.wxPyApp_ProcessIdle(self, *_args, **_kwargs) return val def Yield(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_Yield,(self,) + _args, _kwargs) + val = wxc.wxPyApp_Yield(self, *_args, **_kwargs) return val def SetAppName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetAppName,(self,) + _args, _kwargs) - return val - def SetAuto3D(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetAuto3D,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetAppName(self, *_args, **_kwargs) return val def SetClassName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetClassName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetClassName(self, *_args, **_kwargs) return val def SetExitOnFrameDelete(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetExitOnFrameDelete,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetExitOnFrameDelete(self, *_args, **_kwargs) return val def SetPrintMode(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetPrintMode,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetPrintMode(self, *_args, **_kwargs) return val def SetTopWindow(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetTopWindow,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetTopWindow(self, *_args, **_kwargs) return val def SetVendorName(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetVendorName,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetVendorName(self, *_args, **_kwargs) return val def SetUseBestVisual(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetUseBestVisual,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetUseBestVisual(self, *_args, **_kwargs) return val def GetAssertMode(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetAssertMode,(self,) + _args, _kwargs) + val = wxc.wxPyApp_GetAssertMode(self, *_args, **_kwargs) return val def SetAssertMode(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_SetAssertMode,(self,) + _args, _kwargs) + val = wxc.wxPyApp_SetAssertMode(self, *_args, **_kwargs) return val def __repr__(self): - return "" % (self.this,) + return "<%s.%s instance; proxy of C++ wxPyApp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxPyApp(wxPyAppPtr): def __init__(self,*_args,**_kwargs): - self.this = apply(wxc.new_wxPyApp,_args,_kwargs) + self.this = wxc.new_wxPyApp(*_args,**_kwargs) self.thisown = 1 self._setCallbackInfo(self, wxPyApp) self._setOORInfo(self) @@ -165,7 +159,7 @@ _wxStart = wxc._wxStart _wxSetDictionary = wxc._wxSetDictionary def wxGetApp(*_args, **_kwargs): - val = apply(wxc.wxGetApp,_args,_kwargs) + val = wxc.wxGetApp(*_args,**_kwargs) return val wxApp_CleanUp = wxc.wxApp_CleanUp @@ -246,6 +240,7 @@ wxFRAME_TOOL_WINDOW = wxc.wxFRAME_TOOL_WINDOW wxFRAME_FLOAT_ON_PARENT = wxc.wxFRAME_FLOAT_ON_PARENT wxFRAME_NO_WINDOW_MENU = wxc.wxFRAME_NO_WINDOW_MENU wxFRAME_NO_TASKBAR = wxc.wxFRAME_NO_TASKBAR +wxFRAME_SHAPED = wxc.wxFRAME_SHAPED wxED_CLIENT_MARGIN = wxc.wxED_CLIENT_MARGIN wxED_BUTTONS_BOTTOM = wxc.wxED_BUTTONS_BOTTOM wxED_BUTTONS_RIGHT = wxc.wxED_BUTTONS_RIGHT @@ -255,15 +250,6 @@ wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN wxCLIP_SIBLINGS = wxc.wxCLIP_SIBLINGS wxRETAINED = wxc.wxRETAINED wxBACKINGSTORE = wxc.wxBACKINGSTORE -wxTB_HORIZONTAL = wxc.wxTB_HORIZONTAL -wxTB_VERTICAL = wxc.wxTB_VERTICAL -wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS -wxTB_FLAT = wxc.wxTB_FLAT -wxTB_DOCKABLE = wxc.wxTB_DOCKABLE -wxTB_NOICONS = wxc.wxTB_NOICONS -wxTB_TEXT = wxc.wxTB_TEXT -wxTB_NODIVIDER = wxc.wxTB_NODIVIDER -wxTB_NOALIGN = wxc.wxTB_NOALIGN wxCOLOURED = wxc.wxCOLOURED wxFIXED_LENGTH = wxc.wxFIXED_LENGTH wxALIGN_LEFT = wxc.wxALIGN_LEFT @@ -288,24 +274,6 @@ wxLB_OWNERDRAW = wxc.wxLB_OWNERDRAW wxLB_HSCROLL = wxc.wxLB_HSCROLL wxPROCESS_ENTER = wxc.wxPROCESS_ENTER wxPASSWORD = wxc.wxPASSWORD -wxTE_READONLY = wxc.wxTE_READONLY -wxTE_MULTILINE = wxc.wxTE_MULTILINE -wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB -wxTE_RICH = wxc.wxTE_RICH -wxTE_RICH2 = wxc.wxTE_RICH2 -wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL -wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL -wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER -wxTE_PASSWORD = wxc.wxTE_PASSWORD -wxTE_AUTO_URL = wxc.wxTE_AUTO_URL -wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL -wxTE_DONTWRAP = wxc.wxTE_DONTWRAP -wxTE_LINEWRAP = wxc.wxTE_LINEWRAP -wxTE_WORDWRAP = wxc.wxTE_WORDWRAP -wxTE_LEFT = wxc.wxTE_LEFT -wxTE_RIGHT = wxc.wxTE_RIGHT -wxTE_CENTER = wxc.wxTE_CENTER -wxTE_CENTRE = wxc.wxTE_CENTRE wxCB_SIMPLE = wxc.wxCB_SIMPLE wxCB_DROPDOWN = wxc.wxCB_DROPDOWN wxCB_SORT = wxc.wxCB_SORT @@ -341,18 +309,6 @@ wxBU_TOP = wxc.wxBU_TOP wxBU_RIGHT = wxc.wxBU_RIGHT wxBU_BOTTOM = wxc.wxBU_BOTTOM wxBU_EXACTFIT = wxc.wxBU_EXACTFIT -wxSP_VERTICAL = wxc.wxSP_VERTICAL -wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL -wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS -wxSP_WRAP = wxc.wxSP_WRAP -wxSP_NOBORDER = wxc.wxSP_NOBORDER -wxSP_3D = wxc.wxSP_3D -wxSP_3DSASH = wxc.wxSP_3DSASH -wxSP_3DBORDER = wxc.wxSP_3DBORDER -wxSP_FULLSASH = wxc.wxSP_FULLSASH -wxSP_BORDER = wxc.wxSP_BORDER -wxSP_LIVE_UPDATE = wxc.wxSP_LIVE_UPDATE -wxSP_PERMIT_UNSPLIT = wxc.wxSP_PERMIT_UNSPLIT wxFLOOD_SURFACE = wxc.wxFLOOD_SURFACE wxFLOOD_BORDER = wxc.wxFLOOD_BORDER wxODDEVEN_RULE = wxc.wxODDEVEN_RULE @@ -424,6 +380,18 @@ wxID_CLEAR = wxc.wxID_CLEAR wxID_FIND = wxc.wxID_FIND wxID_DUPLICATE = wxc.wxID_DUPLICATE wxID_SELECTALL = wxc.wxID_SELECTALL +wxID_DELETE = wxc.wxID_DELETE +wxID_REPLACE = wxc.wxID_REPLACE +wxID_REPLACE_ALL = wxc.wxID_REPLACE_ALL +wxID_PROPERTIES = wxc.wxID_PROPERTIES +wxID_VIEW_DETAILS = wxc.wxID_VIEW_DETAILS +wxID_VIEW_LARGEICONS = wxc.wxID_VIEW_LARGEICONS +wxID_VIEW_SMALLICONS = wxc.wxID_VIEW_SMALLICONS +wxID_VIEW_LIST = wxc.wxID_VIEW_LIST +wxID_VIEW_SORTDATE = wxc.wxID_VIEW_SORTDATE +wxID_VIEW_SORTNAME = wxc.wxID_VIEW_SORTNAME +wxID_VIEW_SORTSIZE = wxc.wxID_VIEW_SORTSIZE +wxID_VIEW_SORTTYPE = wxc.wxID_VIEW_SORTTYPE wxID_FILE1 = wxc.wxID_FILE1 wxID_FILE2 = wxc.wxID_FILE2 wxID_FILE3 = wxc.wxID_FILE3 @@ -488,11 +456,6 @@ wxSTRETCH_NOT = wxc.wxSTRETCH_NOT wxSHRINK = wxc.wxSHRINK wxGROW = wxc.wxGROW wxEXPAND = wxc.wxEXPAND -wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH -wxNB_LEFT = wxc.wxNB_LEFT -wxNB_RIGHT = wxc.wxNB_RIGHT -wxNB_BOTTOM = wxc.wxNB_BOTTOM -wxNB_MULTILINE = wxc.wxNB_MULTILINE wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL wxLI_VERTICAL = wxc.wxLI_VERTICAL wxJOYSTICK1 = wxc.wxJOYSTICK1 @@ -505,6 +468,9 @@ wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY wxWS_EX_BLOCK_EVENTS = wxc.wxWS_EX_BLOCK_EVENTS wxWS_EX_TRANSIENT = wxc.wxWS_EX_TRANSIENT +wxWS_EX_THEMED_BACKGROUND = wxc.wxWS_EX_THEMED_BACKGROUND +wxWS_EX_PROCESS_IDLE = wxc.wxWS_EX_PROCESS_IDLE +wxWS_EX_PROCESS_UI_UPDATES = wxc.wxWS_EX_PROCESS_UI_UPDATES wxMM_TEXT = wxc.wxMM_TEXT wxMM_LOMETRIC = wxc.wxMM_LOMETRIC wxMM_HIMETRIC = wxc.wxMM_HIMETRIC @@ -840,6 +806,14 @@ wxHT_WINDOW_VERT_SCROLLBAR = wxc.wxHT_WINDOW_VERT_SCROLLBAR wxHT_WINDOW_HORZ_SCROLLBAR = wxc.wxHT_WINDOW_HORZ_SCROLLBAR wxHT_WINDOW_CORNER = wxc.wxHT_WINDOW_CORNER wxHT_MAX = wxc.wxHT_MAX +wxMOD_NONE = wxc.wxMOD_NONE +wxMOD_ALT = wxc.wxMOD_ALT +wxMOD_CONTROL = wxc.wxMOD_CONTROL +wxMOD_SHIFT = wxc.wxMOD_SHIFT +wxMOD_WIN = wxc.wxMOD_WIN +wxUPDATE_UI_NONE = wxc.wxUPDATE_UI_NONE +wxUPDATE_UI_RECURSE = wxc.wxUPDATE_UI_RECURSE +wxUPDATE_UI_FROMIDLE = wxc.wxUPDATE_UI_FROMIDLE wxEVT_NULL = wxc.wxEVT_NULL wxEVT_FIRST = wxc.wxEVT_FIRST wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED @@ -897,6 +871,7 @@ wxEVT_CHAR = wxc.wxEVT_CHAR wxEVT_KEY_DOWN = wxc.wxEVT_KEY_DOWN wxEVT_KEY_UP = wxc.wxEVT_KEY_UP wxEVT_CHAR_HOOK = wxc.wxEVT_CHAR_HOOK +wxEVT_HOTKEY = wxc.wxEVT_HOTKEY wxEVT_SCROLL_TOP = wxc.wxEVT_SCROLL_TOP wxEVT_SCROLL_BOTTOM = wxc.wxEVT_SCROLL_BOTTOM wxEVT_SCROLL_LINEUP = wxc.wxEVT_SCROLL_LINEUP @@ -916,6 +891,8 @@ wxEVT_SCROLLWIN_THUMBTRACK = wxc.wxEVT_SCROLLWIN_THUMBTRACK wxEVT_SCROLLWIN_THUMBRELEASE = wxc.wxEVT_SCROLLWIN_THUMBRELEASE wxEVT_SIZE = wxc.wxEVT_SIZE wxEVT_MOVE = wxc.wxEVT_MOVE +wxEVT_SIZING = wxc.wxEVT_SIZING +wxEVT_MOVING = wxc.wxEVT_MOVING wxEVT_CLOSE_WINDOW = wxc.wxEVT_CLOSE_WINDOW wxEVT_END_SESSION = wxc.wxEVT_END_SESSION wxEVT_QUERY_END_SESSION = wxc.wxEVT_QUERY_END_SESSION @@ -960,7 +937,6 @@ wxEVT_COMMAND_KILL_FOCUS = wxc.wxEVT_COMMAND_KILL_FOCUS wxEVT_COMMAND_ENTER = wxc.wxEVT_COMMAND_ENTER wxEVT_NAVIGATION_KEY = wxc.wxEVT_NAVIGATION_KEY wxEVT_TIMER = wxc.wxEVT_TIMER -__version__ = wxc.__version__ cvar = wxc.cvar wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition) wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize) @@ -1015,6 +991,12 @@ def EVT_SIZE(win, func): def EVT_MOVE(win, func): win.Connect(-1, -1, wxEVT_MOVE, func) +def EVT_SIZING(win, func): + win.Connect(-1, -1, wxEVT_SIZING, func) + +def EVT_MOVING(win, func): + win.Connect(-1, -1, wxEVT_MOVING, func) + def EVT_CLOSE(win, func): win.Connect(-1, -1, wxEVT_CLOSE_WINDOW, func) @@ -1036,6 +1018,9 @@ def EVT_KEY_DOWN(win, func): def EVT_KEY_UP(win, func): win.Connect(-1, -1, wxEVT_KEY_UP, func) +def EVT_HOTKEY(win, func): + win.Connect(-1, -1, wxEVT_HOTKEY, func) + def EVT_MENU_OPEN(win, func): win.Connect(-1, -1, wxEVT_MENU_OPEN, func) @@ -1460,29 +1445,6 @@ def EVT_SPIN(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func) -# wxTaskBarIcon -def EVT_TASKBAR_MOVE(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func) - -def EVT_TASKBAR_LEFT_DOWN(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func) - -def EVT_TASKBAR_LEFT_UP(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func) - -def EVT_TASKBAR_RIGHT_DOWN(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func) - -def EVT_TASKBAR_RIGHT_UP(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func) - -def EVT_TASKBAR_LEFT_DCLICK(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func) - -def EVT_TASKBAR_RIGHT_DCLICK(win, func): - win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func) - - # wxSashWindow def EVT_SASH_DRAGGED(win, id, func): win.Connect(id, -1, wxEVT_SASH_DRAGGED, func) @@ -1491,10 +1453,10 @@ def EVT_SASH_DRAGGED_RANGE(win, id1, id2, func): win.Connect(id1, id2, wxEVT_SASH_DRAGGED, func) def EVT_QUERY_LAYOUT_INFO(win, func): - win.Connect(-1, -1, wxEVT_EVT_QUERY_LAYOUT_INFO, func) + win.Connect(-1, -1, wxEVT_QUERY_LAYOUT_INFO, func) def EVT_CALCULATE_LAYOUT(win, func): - win.Connect(-1, -1, wxEVT_EVT_CALCULATE_LAYOUT, func) + win.Connect(-1, -1, wxEVT_CALCULATE_LAYOUT, func) #wxSplitterWindow @@ -1584,6 +1546,8 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric # workarounds for bad wxRTTI names __wxPyPtrTypeMap['wxGauge95'] = 'wxGauge' +__wxPyPtrTypeMap['wxSlider95'] = 'wxSlider' +__wxPyPtrTypeMap['wxStatusBar95'] = 'wxStatusBar' @@ -1621,6 +1585,8 @@ if wxPlatform == "__WXGTK__": except: pass +# On MSW add the directory where the wxWindows catalogs were installed +# to the default catalog path. if wxPlatform == "__WXMSW__": import os localedir = os.path.join(os.path.split(__file__)[0], "locale") @@ -1628,15 +1594,17 @@ if wxPlatform == "__WXMSW__": del os #---------------------------------------------------------------------- -# wxWindows version numbers. wxPython version is in __version__. +# Load version numbers from __version__... Ensure that major and minor +# versions are the same for both wxPython and wxWindows. -wxMAJOR_VERSION = wxc.wxMAJOR_VERSION -wxMINOR_VERSION = wxc.wxMINOR_VERSION -wxRELEASE_NUMBER = wxc.wxRELEASE_NUMBER -wxVERSION_STRING = wxc.wxVERSION_STRING -wxVERSION_NUMBER = wxc.wxVERSION_NUMBER +from wxPython.__version__ import * +__version__ = wxVERSION_STRING -wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) +assert wxMAJOR_VERSION == wxc.wxMAJOR_VERSION, "wxPython/wxWindows version mismatch" +assert wxMINOR_VERSION == wxc.wxMINOR_VERSION, "wxPython/wxWindows version mismatch" +if wxRELEASE_VERSION != wxc.wxRELEASE_VERSION: + import warnings + warnings.warn("wxPython/wxWindows release number mismatch") #---------------------------------------------------------------------- @@ -1704,9 +1672,9 @@ def wxCallAfter(callable, *args, **kw): global _wxCallAfterId if _wxCallAfterId is None: - _wxCallAfterId = wxNewId() + _wxCallAfterId = wxNewEventType() app.Connect(-1, -1, _wxCallAfterId, - lambda event: apply(event.callable, event.args, event.kw) ) + lambda event: event.callable(*event.args, **event.kw) ) evt = wxPyEvent() evt.SetEventType(_wxCallAfterId) evt.callable = callable @@ -1714,8 +1682,97 @@ def wxCallAfter(callable, *args, **kw): evt.kw = kw wxPostEvent(app, evt) -# an alias -wxRunLater = wxCallAfter + +#---------------------------------------------------------------------- + + +class wxFutureCall: + """ + A convenience class for wxTimer, that calls the given callable + object once after the given amount of milliseconds, passing any + positional or keyword args. The return value of the callable is + availbale after it has been run with the GetResult method. + + If you don't need to get the return value or restart the timer + then there is no need to hold a reference to this object. It will + hold a reference to itself while the timer is running (the timer + has a reference to self.Notify) but the cycle will be broken when + the timer completes, automatically cleaning up the wxFutureCall + object. + """ + def __init__(self, millis, callable, *args, **kwargs): + self.millis = millis + self.callable = callable + self.SetArgs(*args, **kwargs) + self.runCount = 0 + self.hasRun = False + self.result = None + self.timer = None + self.Start() + + def __del__(self): + self.Stop() + + + def Start(self, millis=None): + """ + (Re)start the timer + """ + self.hasRun = False + if millis is not None: + self.millis = millis + self.Stop() + self.timer = wxPyTimer(self.Notify) + self.timer.Start(self.millis, wxTIMER_ONE_SHOT) + Restart = Start + + + def Stop(self): + """ + Stop and destroy the timer. + """ + if self.timer is not None: + self.timer.Stop() + self.timer = None + + + def GetInterval(self): + if self.timer is not None: + return self.timer.GetInterval() + else: + return 0 + + + def IsRunning(self): + return self.timer is not None and self.timer.IsRunning() + + + def SetArgs(self, *args, **kwargs): + """ + (Re)set the args passed to the callable object. This is + useful in conjunction with Restart if you want to schedule a + new call to the same callable object but with different + parameters. + """ + self.args = args + self.kwargs = kwargs + + def HasRun(self): + return self.hasRun + + def GetResult(self): + return self.result + + def Notify(self): + """ + The timer has expired so call the callable. + """ + if self.callable and getattr(self.callable, 'im_self', True): + self.runCount += 1 + self.result = self.callable(*self.args, **self.kwargs) + self.hasRun = True + wxCallAfter(self.Stop) + #---------------------------------------------------------------------- @@ -1745,6 +1802,35 @@ class _wxPyDeadObject: return 0 +#---------------------------------------------------------------------- + +class wxNotebookPage(wxPanel): + """ + There is an old (and apparently unsolvable) bug when placing a + window with a nonstandard background colour in a wxNotebook on + wxGTK, as the notbooks's background colour would always be used + when the window is refreshed. The solution is to place a panel in + the notbook and the coloured window on the panel, sized to cover + the panel. This simple class does that for you, just put an + instance of this in the notebook and make your regular window a + child of this one and it will handle the resize for you. + """ + def __init__(self, parent, id=-1, + pos=wxDefaultPosition, size=wxDefaultSize, + style=wxTAB_TRAVERSAL, name="panel"): + wxPanel.__init__(self, parent, id, pos, size, style, name) + self.child = None + EVT_SIZE(self, self.OnSize) + def OnSize(self, evt): + if self.child is None: + children = self.GetChildren() + if len(children): + self.child = children[0] + if self.child: + self.child.SetPosition((0,0)) + self.child.SetSize(self.GetSize()) + + #---------------------------------------------------------------------- #---------------------------------------------------------------------- @@ -1799,6 +1885,18 @@ class wxApp(wxPyApp): def __init__(self, redirect=_defRedirect, filename=None, useBestVisual=False): wxPyApp.__init__(self) + + if wx.wxPlatform == "__WXMAC__": + try: + import MacOS + if not MacOS.WMAvailable(): + print """This program needs access to the screen. Please run with +'pythonw', not 'python', and only when you are logged in on the main display +of your Mac.""" + sys.exit(1) + except: + pass + self.stdioWin = None self.saveStdio = (sys.stdout, sys.stderr) @@ -1808,6 +1906,15 @@ class wxApp(wxPyApp): if redirect: self.RedirectStdio(filename) + # Set the default handler for SIGINT. This fixes a problem + # where if Ctrl-C is pressed in the console that started this + # app then it will not appear to do anything, (not even send + # KeyboardInterrupt???) but will later segfault on exit. By + # setting the default handler then the app will exit, as + # expected (depending on platform.) + import signal + signal.signal(signal.SIGINT, signal.SIG_DFL) + # this initializes wxWindows and then calls our OnInit _wxStart(self.OnInit) @@ -1878,7 +1985,7 @@ class wxPyWidgetTester(wxApp): return True def SetWidget(self, widgetClass, *args): - w = apply(widgetClass, (self.frame,) + args) + w = widgetClass(self.frame, *args) self.frame.Show(True) #---------------------------------------------------------------------------- diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i index 83d279eff5..3147ab83f4 100644 --- a/wxPython/src/windows2.i +++ b/wxPython/src/windows2.i @@ -18,7 +18,7 @@ #include #include #ifdef __WXMSW__ -#include +#include #endif %} diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i index 5b0091eecf..4f05180037 100644 --- a/wxPython/src/wx.i +++ b/wxPython/src/wx.i @@ -87,9 +87,6 @@ public: wxString GetAppName(); -#ifdef __WXMSW__ - bool GetAuto3D(); -#endif wxString GetClassName(); bool GetExitOnFrameDelete(); int GetPrintMode(); @@ -106,9 +103,6 @@ public: bool Yield(bool onlyIfNeeded = FALSE); void SetAppName(const wxString& name); -#ifdef __WXMSW__ - void SetAuto3D(bool auto3D); -#endif void SetClassName(const wxString& name); void SetExitOnFrameDelete(bool flag); void SetPrintMode(int mode);