From 7993762b11cb07b74c6f6de483523881dea95482 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 11 Apr 2005 20:44:14 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/animate/mac/animate.py | 2 +- wxPython/src/mac/_controls.py | 11 +- wxPython/src/mac/_controls_wrap.cpp | 65 +++---- wxPython/src/mac/_core.py | 29 +-- wxPython/src/mac/_misc.py | 10 +- wxPython/src/mac/_windows.py | 28 ++- wxPython/src/mac/_windows_wrap.cpp | 233 ++++++++++-------------- 7 files changed, 166 insertions(+), 212 deletions(-) diff --git a/wxPython/contrib/animate/mac/animate.py b/wxPython/contrib/animate/mac/animate.py index a86f400d78..8365363811 100644 --- a/wxPython/contrib/animate/mac/animate.py +++ b/wxPython/contrib/animate/mac/animate.py @@ -2,7 +2,7 @@ # Don't modify this file, modify the SWIG interface instead. """ -Simple animation player classes, including `wxGIFAnimationCtrl` for displaying +Simple animation player classes, including `GIFAnimationCtrl` for displaying animated GIF files """ diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 6259eb6413..b1313620b7 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -2634,6 +2634,7 @@ def RadioButton_GetClassDefaultAttributes(*args, **kwargs): SL_HORIZONTAL = _controls_.SL_HORIZONTAL SL_VERTICAL = _controls_.SL_VERTICAL +SL_TICKS = _controls_.SL_TICKS SL_AUTOTICKS = _controls_.SL_AUTOTICKS SL_LABELS = _controls_.SL_LABELS SL_LEFT = _controls_.SL_LEFT @@ -3220,7 +3221,7 @@ class NotebookPage(wx.Panel): """ There is an old (and apparently unsolvable) bug when placing a window with a nonstandard background colour in a wx.Notebook on - wxGTK, as the notbooks's background colour would always be used + wxGTK1, 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 @@ -3354,6 +3355,10 @@ class Choicebook(BookCtrlBase): """IsVertical(self) -> bool""" return _controls_.Choicebook_IsVertical(*args, **kwargs) + def GetChoiceCtrl(*args, **kwargs): + """GetChoiceCtrl(self) -> Choice""" + return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs) + def DeleteAllPages(*args, **kwargs): """DeleteAllPages(self) -> bool""" return _controls_.Choicebook_DeleteAllPages(*args, **kwargs) @@ -5872,10 +5877,6 @@ class PyControl(_core.Control): """base_ShouldInheritColours(self) -> bool""" return _controls_.PyControl_base_ShouldInheritColours(*args, **kwargs) - def base_ApplyParentThemeBackground(*args, **kwargs): - """base_ApplyParentThemeBackground(self, Colour c)""" - return _controls_.PyControl_base_ApplyParentThemeBackground(*args, **kwargs) - def base_GetDefaultAttributes(*args, **kwargs): """base_GetDefaultAttributes(self) -> VisualAttributes""" return _controls_.PyControl_base_GetDefaultAttributes(*args, **kwargs) diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index eb1d2e91c7..551f5a3828 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -2189,7 +2189,6 @@ public: DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild); DEC_PYCALLBACK_BOOL_const(ShouldInheritColours); - DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground); DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes); DEC_PYCALLBACK_BOOL_(HasTransparentBackground); @@ -2224,7 +2223,6 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, AddChild); IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild); IMP_PYCALLBACK_BOOL_const(wxPyControl, wxControl, ShouldInheritColours); -IMP_PYCALLBACK__COLOUR(wxPyControl, wxControl, ApplyParentThemeBackground); IMP_PYCALLBACK_VIZATTR_(wxPyControl, wxControl, GetDefaultAttributes); IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, HasTransparentBackground); @@ -18015,6 +18013,32 @@ static PyObject *_wrap_Choicebook_IsVertical(PyObject *, PyObject *args, PyObjec } +static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxChoice *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxChoicebook *arg1 = (wxChoicebook *) 0 ; @@ -32845,38 +32869,6 @@ static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *, PyObject } -static PyObject *_wrap_PyControl_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyControl *arg1 = (wxPyControl *) 0 ; - wxColour *arg2 = 0 ; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "c", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_base_ApplyParentThemeBackground",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_ApplyParentThemeBackground((wxColour const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyControl *arg1 = (wxPyControl *) 0 ; @@ -35208,6 +35200,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PreChoicebook", (PyCFunction) _wrap_new_PreChoicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_Create", (PyCFunction) _wrap_Choicebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_IsVertical", (PyCFunction) _wrap_Choicebook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Choicebook_GetChoiceCtrl", (PyCFunction) _wrap_Choicebook_GetChoiceCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_DeleteAllPages", (PyCFunction) _wrap_Choicebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_swigregister", Choicebook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ChoicebookEvent", (PyCFunction) _wrap_new_ChoicebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35635,7 +35628,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyControl_base_AddChild", (PyCFunction) _wrap_PyControl_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_RemoveChild", (PyCFunction) _wrap_PyControl_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_ShouldInheritColours", (PyCFunction) _wrap_PyControl_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyControl_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_GetDefaultAttributes", (PyCFunction) _wrap_PyControl_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_swigregister", PyControl_swigregister, METH_VARARGS, NULL}, { (char *)"new_HelpEvent", (PyCFunction) _wrap_new_HelpEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -37500,6 +37492,9 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"SL_VERTICAL", SWIG_From_int((int)(wxSL_VERTICAL))); } + { + PyDict_SetItemString(d,"SL_TICKS", SWIG_From_int((int)(wxSL_TICKS))); + } { PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_From_int((int)(wxSL_AUTOTICKS))); } diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 156482c38b..ceb9755a86 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -5008,8 +5008,8 @@ class PyApp(EvtHandler): self.this = newobj.this self.thisown = 1 del newobj.thisown - self._setCallbackInfo(self, PyApp) - self._setOORInfo(self) + self._setCallbackInfo(self, PyApp, False) + self._setOORInfo(self, False) def __del__(self, destroy=_core_.delete_PyApp): """__del__(self)""" @@ -5018,7 +5018,7 @@ class PyApp(EvtHandler): except: pass def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(self, PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref)""" return _core_.PyApp__setCallbackInfo(*args, **kwargs) def GetAppName(*args, **kwargs): @@ -5694,9 +5694,12 @@ your Mac.""" def __del__(self): try: self.RestoreStdio() # Just in case the MainLoop was overridden - except: - pass + finally: + wx.PyApp.__del__(self) + def Destroy(self): + wx.PyApp.Destroy(self) + self.thisown = 0 def SetTopWindow(self, frame): """Set the \"main\" top level window""" @@ -11334,11 +11337,15 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION: #---------------------------------------------------------------------------- -# Set the default string<-->unicode conversion encoding from the -# locale. This encoding is used when string or unicode objects need -# to be converted in order to pass them to wxWidgets. Please be aware -# that the default encoding within the same locale may be slightly -# different on different platforms. For example, please see +# Set wxPython's default string<-->unicode conversion encoding from +# the locale, but only if Python's default hasn't been changed. (We +# assume that if the user has customized it already then that is the +# encoding we need to use as well.) +# +# The encoding selected here is used when string or unicode objects +# need to be converted in order to pass them to wxWidgets. Please be +# aware that the default encoding within the same locale may be +# slightly different on different platforms. For example, please see # http://www.alanwood.net/demos/charsetdiffs.html for differences # between the common latin/roman encodings. @@ -11349,7 +11356,7 @@ if default == 'ascii': try: default = locale.getdefaultlocale()[1] codecs.lookup(default) - except (ValueError, LookupError): + except (ValueError, LookupError, TypeError): default = _sys.getdefaultencoding() del locale del codecs diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index 7b54b0a4d8..cca3a2664c 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -3852,12 +3852,13 @@ class DateTime(object): def __repr__(self): if self.IsValid(): - return '' % ( self.Format(), self.this) + f = self.Format().encode(wx.GetDefaultPyEncoding()) + return '' % ( f, self.this) else: return '' % self.this def __str__(self): if self.IsValid(): - return self.Format() + return self.Format().encode(wx.GetDefaultPyEncoding()) else: return "INVALID DateTime" @@ -4177,9 +4178,10 @@ class TimeSpan(object): return _misc_.TimeSpan_Format(*args, **kwargs) def __repr__(self): - return '' % ( self.Format(), self.this) + f = self.Format().encode(wx.GetDefaultPyEncoding()) + return '' % ( f, self.this) def __str__(self): - return self.Format() + return self.Format().encode(wx.GetDefaultPyEncoding()) class TimeSpanPtr(TimeSpan): diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 5748999486..a0af9ffa0a 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -1952,6 +1952,18 @@ class VScrolledWindow(Panel): """GetLineCount(self) -> size_t""" return _windows_.VScrolledWindow_GetLineCount(*args, **kwargs) + def GetVisibleBegin(*args, **kwargs): + """GetVisibleBegin(self) -> size_t""" + return _windows_.VScrolledWindow_GetVisibleBegin(*args, **kwargs) + + def GetVisibleEnd(*args, **kwargs): + """GetVisibleEnd(self) -> size_t""" + return _windows_.VScrolledWindow_GetVisibleEnd(*args, **kwargs) + + def IsVisible(*args, **kwargs): + """IsVisible(self, size_t line) -> bool""" + return _windows_.VScrolledWindow_IsVisible(*args, **kwargs) + def GetFirstVisibleLine(*args, **kwargs): """GetFirstVisibleLine(self) -> size_t""" return _windows_.VScrolledWindow_GetFirstVisibleLine(*args, **kwargs) @@ -1960,10 +1972,6 @@ class VScrolledWindow(Panel): """GetLastVisibleLine(self) -> size_t""" return _windows_.VScrolledWindow_GetLastVisibleLine(*args, **kwargs) - def IsVisible(*args, **kwargs): - """IsVisible(self, size_t line) -> bool""" - return _windows_.VScrolledWindow_IsVisible(*args, **kwargs) - class VScrolledWindowPtr(VScrolledWindow): def __init__(self, this): @@ -3560,10 +3568,6 @@ class PyWindow(_core.Window): """base_ShouldInheritColours(self) -> bool""" return _windows_.PyWindow_base_ShouldInheritColours(*args, **kwargs) - def base_ApplyParentThemeBackground(*args, **kwargs): - """base_ApplyParentThemeBackground(self, Colour c)""" - return _windows_.PyWindow_base_ApplyParentThemeBackground(*args, **kwargs) - def base_GetDefaultAttributes(*args, **kwargs): """base_GetDefaultAttributes(self) -> VisualAttributes""" return _windows_.PyWindow_base_GetDefaultAttributes(*args, **kwargs) @@ -3681,10 +3685,6 @@ class PyPanel(Panel): """base_ShouldInheritColours(self) -> bool""" return _windows_.PyPanel_base_ShouldInheritColours(*args, **kwargs) - def base_ApplyParentThemeBackground(*args, **kwargs): - """base_ApplyParentThemeBackground(self, Colour c)""" - return _windows_.PyPanel_base_ApplyParentThemeBackground(*args, **kwargs) - def base_GetDefaultAttributes(*args, **kwargs): """base_GetDefaultAttributes(self) -> VisualAttributes""" return _windows_.PyPanel_base_GetDefaultAttributes(*args, **kwargs) @@ -3802,10 +3802,6 @@ class PyScrolledWindow(ScrolledWindow): """base_ShouldInheritColours(self) -> bool""" return _windows_.PyScrolledWindow_base_ShouldInheritColours(*args, **kwargs) - def base_ApplyParentThemeBackground(*args, **kwargs): - """base_ApplyParentThemeBackground(self, Colour c)""" - return _windows_.PyScrolledWindow_base_ApplyParentThemeBackground(*args, **kwargs) - def base_GetDefaultAttributes(*args, **kwargs): """base_GetDefaultAttributes(self) -> VisualAttributes""" return _windows_.PyScrolledWindow_base_GetDefaultAttributes(*args, **kwargs) diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index 622617687d..3f1bc6c67c 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -2131,7 +2131,6 @@ public: DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild); DEC_PYCALLBACK_BOOL_const(ShouldInheritColours); - DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground); DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes); DEC_PYCALLBACK_BOOL_(HasTransparentBackground); @@ -2166,7 +2165,6 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, AddChild); IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, RemoveChild); IMP_PYCALLBACK_BOOL_const(wxPyWindow, wxWindow, ShouldInheritColours); -IMP_PYCALLBACK__COLOUR(wxPyWindow, wxWindow, ApplyParentThemeBackground); IMP_PYCALLBACK_VIZATTR_(wxPyWindow, wxWindow, GetDefaultAttributes); IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, HasTransparentBackground); @@ -2212,7 +2210,6 @@ public: DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild); DEC_PYCALLBACK_BOOL_const(ShouldInheritColours); - DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground); DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes); DEC_PYCALLBACK_BOOL_(HasTransparentBackground); @@ -2247,7 +2244,6 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, AddChild); IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild); IMP_PYCALLBACK_BOOL_const(wxPyPanel, wxPanel, ShouldInheritColours); -IMP_PYCALLBACK__COLOUR(wxPyPanel, wxPanel, ApplyParentThemeBackground); IMP_PYCALLBACK_VIZATTR_(wxPyPanel, wxPanel, GetDefaultAttributes); IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, HasTransparentBackground); @@ -2292,7 +2288,6 @@ public: DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild); DEC_PYCALLBACK_BOOL_const(ShouldInheritColours); - DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground); DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes); DEC_PYCALLBACK_BOOL_(HasTransparentBackground); @@ -2327,7 +2322,6 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyScrolledWindow, wxScrolledWindow, AddChild); IMP_PYCALLBACK_VOID_WXWINBASE(wxPyScrolledWindow, wxScrolledWindow, RemoveChild); IMP_PYCALLBACK_BOOL_const(wxPyScrolledWindow, wxScrolledWindow, ShouldInheritColours); -IMP_PYCALLBACK__COLOUR(wxPyScrolledWindow, wxScrolledWindow, ApplyParentThemeBackground); IMP_PYCALLBACK_VIZATTR_(wxPyScrolledWindow, wxScrolledWindow, GetDefaultAttributes); IMP_PYCALLBACK_BOOL_(wxPyScrolledWindow, wxScrolledWindow, HasTransparentBackground); @@ -11414,6 +11408,96 @@ static PyObject *_wrap_VScrolledWindow_GetLineCount(PyObject *, PyObject *args, } +static PyObject *_wrap_VScrolledWindow_GetVisibleBegin(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ; + size_t result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VScrolledWindow_GetVisibleBegin",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyVScrolledWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (size_t)((wxPyVScrolledWindow const *)arg1)->GetVisibleBegin(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_long((unsigned long)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VScrolledWindow_GetVisibleEnd(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ; + size_t result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VScrolledWindow_GetVisibleEnd",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyVScrolledWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (size_t)((wxPyVScrolledWindow const *)arg1)->GetVisibleEnd(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_long((unsigned long)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "line", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_IsVisible",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyVScrolledWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (size_t)(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPyVScrolledWindow const *)arg1)->IsVisible(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_VScrolledWindow_GetFirstVisibleLine(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ; @@ -11470,40 +11554,6 @@ static PyObject *_wrap_VScrolledWindow_GetLastVisibleLine(PyObject *, PyObject * } -static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ; - size_t arg2 ; - bool result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "line", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_IsVisible",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyVScrolledWindow, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (size_t)(SWIG_As_unsigned_SS_long(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyVScrolledWindow const *)arg1)->IsVisible(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; - fail: - return NULL; -} - - static PyObject * VScrolledWindow_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -18313,38 +18363,6 @@ static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject * } -static PyObject *_wrap_PyWindow_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyWindow *arg1 = (wxPyWindow *) 0 ; - wxColour *arg2 = 0 ; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "c", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_base_ApplyParentThemeBackground",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_ApplyParentThemeBackground((wxColour const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyWindow *arg1 = (wxPyWindow *) 0 ; @@ -19182,38 +19200,6 @@ static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *a } -static PyObject *_wrap_PyPanel_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyPanel *arg1 = (wxPyPanel *) 0 ; - wxColour *arg2 = 0 ; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "c", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_base_ApplyParentThemeBackground",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_ApplyParentThemeBackground((wxColour const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyPanel *arg1 = (wxPyPanel *) 0 ; @@ -20051,38 +20037,6 @@ static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, Py } -static PyObject *_wrap_PyScrolledWindow_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; - wxColour *arg2 = 0 ; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "c", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_base_ApplyParentThemeBackground",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_ApplyParentThemeBackground((wxColour const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; @@ -27793,9 +27747,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"VScrolledWindow_HitTest", (PyCFunction) _wrap_VScrolledWindow_HitTest, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"VScrolledWindow_RefreshAll", (PyCFunction) _wrap_VScrolledWindow_RefreshAll, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"VScrolledWindow_GetLineCount", (PyCFunction) _wrap_VScrolledWindow_GetLineCount, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"VScrolledWindow_GetVisibleBegin", (PyCFunction) _wrap_VScrolledWindow_GetVisibleBegin, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"VScrolledWindow_GetVisibleEnd", (PyCFunction) _wrap_VScrolledWindow_GetVisibleEnd, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"VScrolledWindow_IsVisible", (PyCFunction) _wrap_VScrolledWindow_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"VScrolledWindow_GetFirstVisibleLine", (PyCFunction) _wrap_VScrolledWindow_GetFirstVisibleLine, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"VScrolledWindow_GetLastVisibleLine", (PyCFunction) _wrap_VScrolledWindow_GetLastVisibleLine, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"VScrolledWindow_IsVisible", (PyCFunction) _wrap_VScrolledWindow_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"VScrolledWindow_swigregister", VScrolledWindow_swigregister, METH_VARARGS, NULL}, { (char *)"new_VListBox", (PyCFunction) _wrap_new_VListBox, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreVListBox", (PyCFunction) _wrap_new_PreVListBox, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -27989,7 +27945,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyWindow_base_AddChild", (PyCFunction) _wrap_PyWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWindow_base_RemoveChild", (PyCFunction) _wrap_PyWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyWindow_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWindow_swigregister", PyWindow_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyPanel", (PyCFunction) _wrap_new_PyPanel, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -28015,7 +27970,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyPanel_base_AddChild", (PyCFunction) _wrap_PyPanel_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel_base_RemoveChild", (PyCFunction) _wrap_PyPanel_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel_base_ShouldInheritColours", (PyCFunction) _wrap_PyPanel_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyPanel_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel_base_GetDefaultAttributes", (PyCFunction) _wrap_PyPanel_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel_swigregister", PyPanel_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyScrolledWindow", (PyCFunction) _wrap_new_PyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -28041,7 +27995,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyScrolledWindow_base_AddChild", (PyCFunction) _wrap_PyScrolledWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow_base_RemoveChild", (PyCFunction) _wrap_PyScrolledWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyScrolledWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyScrolledWindow_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyScrolledWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow_swigregister", PyScrolledWindow_swigregister, METH_VARARGS, NULL}, { (char *)"new_PrintData", _wrap_new_PrintData, METH_VARARGS, NULL},