From 908b74cdd65b7008c87809882a48a95e5851f249 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 16 Jun 2004 03:47:18 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_controls.py | 9 +- wxPython/src/gtk/_controls_wrap.cpp | 94 +----- wxPython/src/gtk/_core.py | 77 ++++- wxPython/src/gtk/_core_wrap.cpp | 463 +++++++++++++++++---------- wxPython/src/mac/_controls.py | 9 +- wxPython/src/mac/_controls_wrap.cpp | 94 +----- wxPython/src/mac/_core.py | 77 ++++- wxPython/src/mac/_core_wrap.cpp | 463 +++++++++++++++++---------- wxPython/src/msw/_controls.py | 9 +- wxPython/src/msw/_controls_wrap.cpp | 94 +----- wxPython/src/msw/_core.py | 107 ++++--- wxPython/src/msw/_core_wrap.cpp | 466 ++++++++++++++++++---------- 12 files changed, 1137 insertions(+), 825 deletions(-) diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index b8248bd580..89076dc3fc 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -1459,13 +1459,12 @@ TE_HT_BEYOND = _controls_.TE_HT_BEYOND class TextAttr(object): def __repr__(self): return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args): + def __init__(self, *args, **kwargs): """ - __init__(self) -> TextAttr - __init__(self, Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont, - int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr + __init__(self, Colour colText=wxNullColour, Colour colBack=wxNullColour, + Font font=wxNullFont, int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr """ - newobj = _controls_.new_TextAttr(*args) + newobj = _controls_.new_TextAttr(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index b7a4fd7972..b2c58b4a83 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -7012,28 +7012,10 @@ static PyObject *_wrap_TextCtrlNameStr_get() { } -static PyObject *_wrap_new_TextAttr__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTextAttr *result; - - if(!PyArg_ParseTuple(args,(char *)":new_TextAttr")) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTextAttr *)new wxTextAttr(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextAttr, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxColour *arg1 = 0 ; + wxColour const &arg1_defvalue = wxNullColour ; + wxColour *arg1 = (wxColour *) &arg1_defvalue ; wxColour const &arg2_defvalue = wxNullColour ; wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxFont const &arg3_defvalue = wxNullFont ; @@ -7046,11 +7028,16 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "colText",(char *) "colBack",(char *) "font",(char *) "alignment", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|OOO:new_TextAttr",&obj0,&obj1,&obj2,&obj3)) goto fail; - { - arg1 = &temp1; - if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TextAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = &temp1; + if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; + } } if (obj1) { { @@ -7085,61 +7072,6 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { } -static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[5]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 4); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if (argc == 0) { - return _wrap_new_TextAttr__SWIG_0(self,args); - } - if ((argc >= 1) && (argc <= 4)) { - int _v; - { - _v = wxColour_typecheck(argv[0]); - } - if (_v) { - if (argc <= 1) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - { - _v = wxColour_typecheck(argv[1]); - } - if (_v) { - if (argc <= 2) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - { - void *ptr; - if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxFont, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - if (argc <= 3) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - _v = SWIG_CheckInt(argv[3]); - if (_v) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - } - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_TextAttr'"); - return NULL; -} - - static PyObject *_wrap_delete_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextAttr *arg1 = (wxTextAttr *) 0 ; @@ -31414,7 +31346,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"CheckListBox_HitTest", (PyCFunction) _wrap_CheckListBox_HitTest, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS }, - { (char *)"new_TextAttr", _wrap_new_TextAttr, METH_VARARGS }, + { (char *)"new_TextAttr", (PyCFunction) _wrap_new_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_TextAttr", (PyCFunction) _wrap_delete_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index d0a18ae629..3f4e727230 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -4251,7 +4251,7 @@ class NavigationKeyEvent(Event): return _core_.NavigationKeyEvent_GetDirection(*args, **kwargs) def SetDirection(*args, **kwargs): - """SetDirection(self, bool bForward)""" + """SetDirection(self, bool forward)""" return _core_.NavigationKeyEvent_SetDirection(*args, **kwargs) def IsWindowChange(*args, **kwargs): @@ -4259,9 +4259,13 @@ class NavigationKeyEvent(Event): return _core_.NavigationKeyEvent_IsWindowChange(*args, **kwargs) def SetWindowChange(*args, **kwargs): - """SetWindowChange(self, bool bIs)""" + """SetWindowChange(self, bool ischange)""" return _core_.NavigationKeyEvent_SetWindowChange(*args, **kwargs) + def SetFlags(*args, **kwargs): + """SetFlags(self, long flags)""" + return _core_.NavigationKeyEvent_SetFlags(*args, **kwargs) + def GetCurrentFocus(*args, **kwargs): """GetCurrentFocus(self) -> Window""" return _core_.NavigationKeyEvent_GetCurrentFocus(*args, **kwargs) @@ -4270,6 +4274,8 @@ class NavigationKeyEvent(Event): """SetCurrentFocus(self, Window win)""" return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs) + IsForward = _core_.NavigationKeyEvent_IsForward + WinChange = _core_.NavigationKeyEvent_WinChange class NavigationKeyEventPtr(NavigationKeyEvent): def __init__(self, this): @@ -5876,22 +5882,25 @@ class Window(EvtHandler): def SetSizeHints(*args): """ + SetSizeHints(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) SetSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1) - SetSizeHints(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) Allows specification of minimum and maximum window sizes, and window size increments. If a pair of values is not set (or set to -1), the default values will be used. If this function is called, the user - will not be able to size the window outside the given bounds. The - resizing increments are only significant under Motif or Xt. + will not be able to size the window outside the given bounds (if it is + a top-level window.) Sizers will also inspect the minimum window size + and will use that value if set when calculating layout. + + The resizing increments are only significant under Motif or Xt. """ return _core_.Window_SetSizeHints(*args) def SetVirtualSizeHints(*args): """ - SetVirtualSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1) SetVirtualSizeHints(self, Size minSize, Size maxSize=DefaultSize) + SetVirtualSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1) Allows specification of minimum and maximum virtual window sizes. If a pair of values is not set (or set to -1), the default values will be @@ -5900,6 +5909,32 @@ class Window(EvtHandler): """ return _core_.Window_SetVirtualSizeHints(*args) + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _core_.Window_GetMaxSize(*args, **kwargs) + + def GetMinSize(*args, **kwargs): + """GetMinSize(self) -> Size""" + return _core_.Window_GetMinSize(*args, **kwargs) + + def SetMinSize(*args, **kwargs): + """ + SetMinSize(self, Size minSize) + + A more convenient method than `SetSizeHints` for setting just the + min size. + """ + return _core_.Window_SetMinSize(*args, **kwargs) + + def SetMaxSize(*args, **kwargs): + """ + SetMaxSize(self, Size maxSize) + + A more convenient method than `SetSizeHints` for setting just the + max size. + """ + return _core_.Window_SetMaxSize(*args, **kwargs) + def GetMinWidth(*args, **kwargs): """GetMinWidth(self) -> int""" return _core_.Window_GetMinWidth(*args, **kwargs) @@ -5916,14 +5951,6 @@ class Window(EvtHandler): """GetMaxHeight(self) -> int""" return _core_.Window_GetMaxHeight(*args, **kwargs) - def GetMaxSize(*args, **kwargs): - """GetMaxSize(self) -> Size""" - return _core_.Window_GetMaxSize(*args, **kwargs) - - def GetMinSize(*args, **kwargs): - """GetMinSize(self) -> Size""" - return _core_.Window_GetMinSize(*args, **kwargs) - def SetVirtualSize(*args, **kwargs): """ SetVirtualSize(self, Size size) @@ -6189,6 +6216,28 @@ class Window(EvtHandler): """ return _core_.Window_SetTmpDefaultItem(*args, **kwargs) + def Navigate(*args, **kwargs): + """ + Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool + + :param flags: A combination of the ``IsForward`` and ``WinChange`` + values in the `wx.NavigationKeyEvent` class, which + determine if the navigation should be in forward or + reverse order, and if it should be able to cross + parent window boundaries, such as between notebook + pages or MDI child frames. Typically the status of + the Shift key (for forward or reverse) or the + Control key (for WinChange) would be used to + determine how to set the flags. + + situation in which you may wish to call this method is from a text + rol custom keypress handler to do the default navigation behaviour + the tab key, since the standard default behaviour for a multiline + control with the wx.TE_PROCESS_TAB style is to insert a tab and + navigate to the next control. + """ + return _core_.Window_Navigate(*args, **kwargs) + def GetChildren(*args, **kwargs): """ GetChildren(self) -> PyObject diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index 239b417b95..aa830ba40d 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -18608,7 +18608,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "bForward", NULL + (char *) "self",(char *) "forward", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail; @@ -18665,7 +18665,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "bIs", NULL + (char *) "self",(char *) "ischange", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail; @@ -18687,6 +18687,35 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje } +static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ; + long arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetFlags(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ; @@ -22995,6 +23024,55 @@ static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + wxSize temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -23048,55 +23126,6 @@ static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *arg } -static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize *arg2 = 0 ; - wxSize const &arg3_defvalue = wxDefaultSize ; - wxSize *arg3 = (wxSize *) &arg3_defvalue ; - wxSize const &arg4_defvalue = wxDefaultSize ; - wxSize *arg4 = (wxSize *) &arg4_defvalue ; - wxSize temp2 ; - wxSize temp3 ; - wxSize temp4 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - if (obj2) { - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } - } - if (obj3) { - { - arg4 = &temp4; - if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { int argc; PyObject *argv[8]; @@ -23123,20 +23152,20 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { } if (_v) { if (argc <= 2) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); } if (_v) { if (argc <= 3) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[3], wxT("wxSize"), 2); } if (_v) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } } } @@ -23159,26 +23188,26 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { _v = SWIG_CheckInt(argv[2]); if (_v) { if (argc <= 3) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[3]); if (_v) { if (argc <= 4) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[4]); if (_v) { if (argc <= 5) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[5]); if (_v) { if (argc <= 6) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[6]); if (_v) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } } } @@ -23194,6 +23223,45 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -23235,45 +23303,6 @@ static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObje } -static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize *arg2 = 0 ; - wxSize const &arg3_defvalue = wxDefaultSize ; - wxSize *arg3 = (wxSize *) &arg3_defvalue ; - wxSize temp2 ; - wxSize temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - if (obj2) { - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args) { int argc; PyObject *argv[6]; @@ -23300,13 +23329,13 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } if (_v) { if (argc <= 2) { - return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); } if (_v) { - return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); } } } @@ -23328,16 +23357,16 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args _v = SWIG_CheckInt(argv[2]); if (_v) { if (argc <= 3) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[3]); if (_v) { if (argc <= 4) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[4]); if (_v) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } } } @@ -23350,6 +23379,130 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } +static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMaxSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMinSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "minSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMinSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMinSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "maxSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMaxSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMaxSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -23454,66 +23607,6 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetMaxSize(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetMinSize(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -24336,6 +24429,40 @@ static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *self, PyObject *args, } +static PyObject *_wrap_Window_Navigate(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) wxNavigationKeyEvent::IsForward ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Navigate",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Navigate(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_Window_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -40329,6 +40456,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"NavigationKeyEvent_SetDirection", (PyCFunction) _wrap_NavigationKeyEvent_SetDirection, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_IsWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_IsWindowChange, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_SetWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_SetWindowChange, METH_VARARGS | METH_KEYWORDS }, + { (char *)"NavigationKeyEvent_SetFlags", (PyCFunction) _wrap_NavigationKeyEvent_SetFlags, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_GetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_GetCurrentFocus, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_swigregister", NavigationKeyEvent_swigregister, METH_VARARGS }, @@ -40482,12 +40610,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetSizeHints", _wrap_Window_SetSizeHints, METH_VARARGS }, { (char *)"Window_SetVirtualSizeHints", _wrap_Window_SetVirtualSizeHints, METH_VARARGS }, + { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetMinSize", (PyCFunction) _wrap_Window_SetMinSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetMaxSize", (PyCFunction) _wrap_Window_SetMaxSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS }, @@ -40516,6 +40646,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetDefaultItem", (PyCFunction) _wrap_Window_GetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetDefaultItem", (PyCFunction) _wrap_Window_SetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetTmpDefaultItem", (PyCFunction) _wrap_Window_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_Navigate", (PyCFunction) _wrap_Window_Navigate, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetChildren", (PyCFunction) _wrap_Window_GetChildren, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetParent", (PyCFunction) _wrap_Window_GetParent, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetGrandParent", (PyCFunction) _wrap_Window_GetGrandParent, METH_VARARGS | METH_KEYWORDS }, @@ -42451,6 +42582,8 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward)); + PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange)); PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL)); PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_FromInt((int)wxIDLE_PROCESS_SPECIFIED)); PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_FromInt((int)wxPYAPP_ASSERT_SUPPRESS)); diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 774814f263..68159f1943 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -1455,13 +1455,12 @@ TE_HT_BEYOND = _controls_.TE_HT_BEYOND class TextAttr(object): def __repr__(self): return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args): + def __init__(self, *args, **kwargs): """ - __init__(self) -> TextAttr - __init__(self, Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont, - int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr + __init__(self, Colour colText=wxNullColour, Colour colBack=wxNullColour, + Font font=wxNullFont, int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr """ - newobj = _controls_.new_TextAttr(*args) + newobj = _controls_.new_TextAttr(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index e868ba2e87..b781345ce1 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -6983,28 +6983,10 @@ static PyObject *_wrap_TextCtrlNameStr_get() { } -static PyObject *_wrap_new_TextAttr__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTextAttr *result; - - if(!PyArg_ParseTuple(args,(char *)":new_TextAttr")) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTextAttr *)new wxTextAttr(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextAttr, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxColour *arg1 = 0 ; + wxColour const &arg1_defvalue = wxNullColour ; + wxColour *arg1 = (wxColour *) &arg1_defvalue ; wxColour const &arg2_defvalue = wxNullColour ; wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxFont const &arg3_defvalue = wxNullFont ; @@ -7017,11 +6999,16 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "colText",(char *) "colBack",(char *) "font",(char *) "alignment", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|OOO:new_TextAttr",&obj0,&obj1,&obj2,&obj3)) goto fail; - { - arg1 = &temp1; - if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TextAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = &temp1; + if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; + } } if (obj1) { { @@ -7056,61 +7043,6 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { } -static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[5]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 4); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if (argc == 0) { - return _wrap_new_TextAttr__SWIG_0(self,args); - } - if ((argc >= 1) && (argc <= 4)) { - int _v; - { - _v = wxColour_typecheck(argv[0]); - } - if (_v) { - if (argc <= 1) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - { - _v = wxColour_typecheck(argv[1]); - } - if (_v) { - if (argc <= 2) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - { - void *ptr; - if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxFont, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - if (argc <= 3) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - _v = SWIG_CheckInt(argv[3]); - if (_v) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - } - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_TextAttr'"); - return NULL; -} - - static PyObject *_wrap_delete_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextAttr *arg1 = (wxTextAttr *) 0 ; @@ -31384,7 +31316,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"CheckListBox_HitTest", (PyCFunction) _wrap_CheckListBox_HitTest, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS }, - { (char *)"new_TextAttr", _wrap_new_TextAttr, METH_VARARGS }, + { (char *)"new_TextAttr", (PyCFunction) _wrap_new_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_TextAttr", (PyCFunction) _wrap_delete_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index d0a18ae629..3f4e727230 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -4251,7 +4251,7 @@ class NavigationKeyEvent(Event): return _core_.NavigationKeyEvent_GetDirection(*args, **kwargs) def SetDirection(*args, **kwargs): - """SetDirection(self, bool bForward)""" + """SetDirection(self, bool forward)""" return _core_.NavigationKeyEvent_SetDirection(*args, **kwargs) def IsWindowChange(*args, **kwargs): @@ -4259,9 +4259,13 @@ class NavigationKeyEvent(Event): return _core_.NavigationKeyEvent_IsWindowChange(*args, **kwargs) def SetWindowChange(*args, **kwargs): - """SetWindowChange(self, bool bIs)""" + """SetWindowChange(self, bool ischange)""" return _core_.NavigationKeyEvent_SetWindowChange(*args, **kwargs) + def SetFlags(*args, **kwargs): + """SetFlags(self, long flags)""" + return _core_.NavigationKeyEvent_SetFlags(*args, **kwargs) + def GetCurrentFocus(*args, **kwargs): """GetCurrentFocus(self) -> Window""" return _core_.NavigationKeyEvent_GetCurrentFocus(*args, **kwargs) @@ -4270,6 +4274,8 @@ class NavigationKeyEvent(Event): """SetCurrentFocus(self, Window win)""" return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs) + IsForward = _core_.NavigationKeyEvent_IsForward + WinChange = _core_.NavigationKeyEvent_WinChange class NavigationKeyEventPtr(NavigationKeyEvent): def __init__(self, this): @@ -5876,22 +5882,25 @@ class Window(EvtHandler): def SetSizeHints(*args): """ + SetSizeHints(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) SetSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1) - SetSizeHints(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) Allows specification of minimum and maximum window sizes, and window size increments. If a pair of values is not set (or set to -1), the default values will be used. If this function is called, the user - will not be able to size the window outside the given bounds. The - resizing increments are only significant under Motif or Xt. + will not be able to size the window outside the given bounds (if it is + a top-level window.) Sizers will also inspect the minimum window size + and will use that value if set when calculating layout. + + The resizing increments are only significant under Motif or Xt. """ return _core_.Window_SetSizeHints(*args) def SetVirtualSizeHints(*args): """ - SetVirtualSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1) SetVirtualSizeHints(self, Size minSize, Size maxSize=DefaultSize) + SetVirtualSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1) Allows specification of minimum and maximum virtual window sizes. If a pair of values is not set (or set to -1), the default values will be @@ -5900,6 +5909,32 @@ class Window(EvtHandler): """ return _core_.Window_SetVirtualSizeHints(*args) + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _core_.Window_GetMaxSize(*args, **kwargs) + + def GetMinSize(*args, **kwargs): + """GetMinSize(self) -> Size""" + return _core_.Window_GetMinSize(*args, **kwargs) + + def SetMinSize(*args, **kwargs): + """ + SetMinSize(self, Size minSize) + + A more convenient method than `SetSizeHints` for setting just the + min size. + """ + return _core_.Window_SetMinSize(*args, **kwargs) + + def SetMaxSize(*args, **kwargs): + """ + SetMaxSize(self, Size maxSize) + + A more convenient method than `SetSizeHints` for setting just the + max size. + """ + return _core_.Window_SetMaxSize(*args, **kwargs) + def GetMinWidth(*args, **kwargs): """GetMinWidth(self) -> int""" return _core_.Window_GetMinWidth(*args, **kwargs) @@ -5916,14 +5951,6 @@ class Window(EvtHandler): """GetMaxHeight(self) -> int""" return _core_.Window_GetMaxHeight(*args, **kwargs) - def GetMaxSize(*args, **kwargs): - """GetMaxSize(self) -> Size""" - return _core_.Window_GetMaxSize(*args, **kwargs) - - def GetMinSize(*args, **kwargs): - """GetMinSize(self) -> Size""" - return _core_.Window_GetMinSize(*args, **kwargs) - def SetVirtualSize(*args, **kwargs): """ SetVirtualSize(self, Size size) @@ -6189,6 +6216,28 @@ class Window(EvtHandler): """ return _core_.Window_SetTmpDefaultItem(*args, **kwargs) + def Navigate(*args, **kwargs): + """ + Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool + + :param flags: A combination of the ``IsForward`` and ``WinChange`` + values in the `wx.NavigationKeyEvent` class, which + determine if the navigation should be in forward or + reverse order, and if it should be able to cross + parent window boundaries, such as between notebook + pages or MDI child frames. Typically the status of + the Shift key (for forward or reverse) or the + Control key (for WinChange) would be used to + determine how to set the flags. + + situation in which you may wish to call this method is from a text + rol custom keypress handler to do the default navigation behaviour + the tab key, since the standard default behaviour for a multiline + control with the wx.TE_PROCESS_TAB style is to insert a tab and + navigate to the next control. + """ + return _core_.Window_Navigate(*args, **kwargs) + def GetChildren(*args, **kwargs): """ GetChildren(self) -> PyObject diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 239b417b95..aa830ba40d 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -18608,7 +18608,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "bForward", NULL + (char *) "self",(char *) "forward", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail; @@ -18665,7 +18665,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "bIs", NULL + (char *) "self",(char *) "ischange", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail; @@ -18687,6 +18687,35 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje } +static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ; + long arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetFlags(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ; @@ -22995,6 +23024,55 @@ static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + wxSize temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -23048,55 +23126,6 @@ static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *arg } -static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize *arg2 = 0 ; - wxSize const &arg3_defvalue = wxDefaultSize ; - wxSize *arg3 = (wxSize *) &arg3_defvalue ; - wxSize const &arg4_defvalue = wxDefaultSize ; - wxSize *arg4 = (wxSize *) &arg4_defvalue ; - wxSize temp2 ; - wxSize temp3 ; - wxSize temp4 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - if (obj2) { - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } - } - if (obj3) { - { - arg4 = &temp4; - if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { int argc; PyObject *argv[8]; @@ -23123,20 +23152,20 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { } if (_v) { if (argc <= 2) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); } if (_v) { if (argc <= 3) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[3], wxT("wxSize"), 2); } if (_v) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } } } @@ -23159,26 +23188,26 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { _v = SWIG_CheckInt(argv[2]); if (_v) { if (argc <= 3) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[3]); if (_v) { if (argc <= 4) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[4]); if (_v) { if (argc <= 5) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[5]); if (_v) { if (argc <= 6) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[6]); if (_v) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } } } @@ -23194,6 +23223,45 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -23235,45 +23303,6 @@ static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObje } -static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize *arg2 = 0 ; - wxSize const &arg3_defvalue = wxDefaultSize ; - wxSize *arg3 = (wxSize *) &arg3_defvalue ; - wxSize temp2 ; - wxSize temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - if (obj2) { - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args) { int argc; PyObject *argv[6]; @@ -23300,13 +23329,13 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } if (_v) { if (argc <= 2) { - return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); } if (_v) { - return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); } } } @@ -23328,16 +23357,16 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args _v = SWIG_CheckInt(argv[2]); if (_v) { if (argc <= 3) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[3]); if (_v) { if (argc <= 4) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[4]); if (_v) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } } } @@ -23350,6 +23379,130 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } +static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMaxSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMinSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "minSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMinSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMinSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "maxSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMaxSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMaxSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -23454,66 +23607,6 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetMaxSize(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetMinSize(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -24336,6 +24429,40 @@ static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *self, PyObject *args, } +static PyObject *_wrap_Window_Navigate(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) wxNavigationKeyEvent::IsForward ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Navigate",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Navigate(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_Window_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -40329,6 +40456,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"NavigationKeyEvent_SetDirection", (PyCFunction) _wrap_NavigationKeyEvent_SetDirection, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_IsWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_IsWindowChange, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_SetWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_SetWindowChange, METH_VARARGS | METH_KEYWORDS }, + { (char *)"NavigationKeyEvent_SetFlags", (PyCFunction) _wrap_NavigationKeyEvent_SetFlags, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_GetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_GetCurrentFocus, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_swigregister", NavigationKeyEvent_swigregister, METH_VARARGS }, @@ -40482,12 +40610,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetSizeHints", _wrap_Window_SetSizeHints, METH_VARARGS }, { (char *)"Window_SetVirtualSizeHints", _wrap_Window_SetVirtualSizeHints, METH_VARARGS }, + { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetMinSize", (PyCFunction) _wrap_Window_SetMinSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetMaxSize", (PyCFunction) _wrap_Window_SetMaxSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS }, @@ -40516,6 +40646,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetDefaultItem", (PyCFunction) _wrap_Window_GetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetDefaultItem", (PyCFunction) _wrap_Window_SetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetTmpDefaultItem", (PyCFunction) _wrap_Window_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_Navigate", (PyCFunction) _wrap_Window_Navigate, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetChildren", (PyCFunction) _wrap_Window_GetChildren, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetParent", (PyCFunction) _wrap_Window_GetParent, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetGrandParent", (PyCFunction) _wrap_Window_GetGrandParent, METH_VARARGS | METH_KEYWORDS }, @@ -42451,6 +42582,8 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward)); + PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange)); PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL)); PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_FromInt((int)wxIDLE_PROCESS_SPECIFIED)); PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_FromInt((int)wxPYAPP_ASSERT_SUPPRESS)); diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index edb9a4eaed..e79a33ba65 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -1459,13 +1459,12 @@ TE_HT_BEYOND = _controls_.TE_HT_BEYOND class TextAttr(object): def __repr__(self): return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args): + def __init__(self, *args, **kwargs): """ - __init__(self) -> TextAttr - __init__(self, Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont, - int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr + __init__(self, Colour colText=wxNullColour, Colour colBack=wxNullColour, + Font font=wxNullFont, int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr """ - newobj = _controls_.new_TextAttr(*args) + newobj = _controls_.new_TextAttr(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 02e8fda0a8..ec02f4ade8 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -7009,28 +7009,10 @@ static PyObject *_wrap_TextCtrlNameStr_get() { } -static PyObject *_wrap_new_TextAttr__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTextAttr *result; - - if(!PyArg_ParseTuple(args,(char *)":new_TextAttr")) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTextAttr *)new wxTextAttr(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextAttr, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxColour *arg1 = 0 ; + wxColour const &arg1_defvalue = wxNullColour ; + wxColour *arg1 = (wxColour *) &arg1_defvalue ; wxColour const &arg2_defvalue = wxNullColour ; wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxFont const &arg3_defvalue = wxNullFont ; @@ -7043,11 +7025,16 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "colText",(char *) "colBack",(char *) "font",(char *) "alignment", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|OOO:new_TextAttr",&obj0,&obj1,&obj2,&obj3)) goto fail; - { - arg1 = &temp1; - if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TextAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = &temp1; + if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; + } } if (obj1) { { @@ -7082,61 +7069,6 @@ static PyObject *_wrap_new_TextAttr__SWIG_1(PyObject *self, PyObject *args) { } -static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[5]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 4); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if (argc == 0) { - return _wrap_new_TextAttr__SWIG_0(self,args); - } - if ((argc >= 1) && (argc <= 4)) { - int _v; - { - _v = wxColour_typecheck(argv[0]); - } - if (_v) { - if (argc <= 1) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - { - _v = wxColour_typecheck(argv[1]); - } - if (_v) { - if (argc <= 2) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - { - void *ptr; - if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxFont, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - if (argc <= 3) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - _v = SWIG_CheckInt(argv[3]); - if (_v) { - return _wrap_new_TextAttr__SWIG_1(self,args); - } - } - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_TextAttr'"); - return NULL; -} - - static PyObject *_wrap_delete_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextAttr *arg1 = (wxTextAttr *) 0 ; @@ -31617,7 +31549,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"CheckListBox_HitTest", (PyCFunction) _wrap_CheckListBox_HitTest, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS }, - { (char *)"new_TextAttr", _wrap_new_TextAttr, METH_VARARGS }, + { (char *)"new_TextAttr", (PyCFunction) _wrap_new_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_TextAttr", (PyCFunction) _wrap_delete_TextAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 57bc0fb29b..203dd9bb3c 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -4251,7 +4251,7 @@ class NavigationKeyEvent(Event): return _core_.NavigationKeyEvent_GetDirection(*args, **kwargs) def SetDirection(*args, **kwargs): - """SetDirection(self, bool bForward)""" + """SetDirection(self, bool forward)""" return _core_.NavigationKeyEvent_SetDirection(*args, **kwargs) def IsWindowChange(*args, **kwargs): @@ -4259,9 +4259,13 @@ class NavigationKeyEvent(Event): return _core_.NavigationKeyEvent_IsWindowChange(*args, **kwargs) def SetWindowChange(*args, **kwargs): - """SetWindowChange(self, bool bIs)""" + """SetWindowChange(self, bool ischange)""" return _core_.NavigationKeyEvent_SetWindowChange(*args, **kwargs) + def SetFlags(*args, **kwargs): + """SetFlags(self, long flags)""" + return _core_.NavigationKeyEvent_SetFlags(*args, **kwargs) + def GetCurrentFocus(*args, **kwargs): """GetCurrentFocus(self) -> Window""" return _core_.NavigationKeyEvent_GetCurrentFocus(*args, **kwargs) @@ -4270,6 +4274,8 @@ class NavigationKeyEvent(Event): """SetCurrentFocus(self, Window win)""" return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs) + IsForward = _core_.NavigationKeyEvent_IsForward + WinChange = _core_.NavigationKeyEvent_WinChange class NavigationKeyEventPtr(NavigationKeyEvent): def __init__(self, this): @@ -5876,22 +5882,25 @@ class Window(EvtHandler): def SetSizeHints(*args): """ + SetSizeHints(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) SetSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1) - SetSizeHints(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) Allows specification of minimum and maximum window sizes, and window size increments. If a pair of values is not set (or set to -1), the default values will be used. If this function is called, the user - will not be able to size the window outside the given bounds. The - resizing increments are only significant under Motif or Xt. + will not be able to size the window outside the given bounds (if it is + a top-level window.) Sizers will also inspect the minimum window size + and will use that value if set when calculating layout. + + The resizing increments are only significant under Motif or Xt. """ return _core_.Window_SetSizeHints(*args) def SetVirtualSizeHints(*args): """ - SetVirtualSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1) SetVirtualSizeHints(self, Size minSize, Size maxSize=DefaultSize) + SetVirtualSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1) Allows specification of minimum and maximum virtual window sizes. If a pair of values is not set (or set to -1), the default values will be @@ -5900,6 +5909,32 @@ class Window(EvtHandler): """ return _core_.Window_SetVirtualSizeHints(*args) + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _core_.Window_GetMaxSize(*args, **kwargs) + + def GetMinSize(*args, **kwargs): + """GetMinSize(self) -> Size""" + return _core_.Window_GetMinSize(*args, **kwargs) + + def SetMinSize(*args, **kwargs): + """ + SetMinSize(self, Size minSize) + + A more convenient method than `SetSizeHints` for setting just the + min size. + """ + return _core_.Window_SetMinSize(*args, **kwargs) + + def SetMaxSize(*args, **kwargs): + """ + SetMaxSize(self, Size maxSize) + + A more convenient method than `SetSizeHints` for setting just the + max size. + """ + return _core_.Window_SetMaxSize(*args, **kwargs) + def GetMinWidth(*args, **kwargs): """GetMinWidth(self) -> int""" return _core_.Window_GetMinWidth(*args, **kwargs) @@ -5916,14 +5951,6 @@ class Window(EvtHandler): """GetMaxHeight(self) -> int""" return _core_.Window_GetMaxHeight(*args, **kwargs) - def GetMaxSize(*args, **kwargs): - """GetMaxSize(self) -> Size""" - return _core_.Window_GetMaxSize(*args, **kwargs) - - def GetMinSize(*args, **kwargs): - """GetMinSize(self) -> Size""" - return _core_.Window_GetMinSize(*args, **kwargs) - def SetVirtualSize(*args, **kwargs): """ SetVirtualSize(self, Size size) @@ -6189,6 +6216,28 @@ class Window(EvtHandler): """ return _core_.Window_SetTmpDefaultItem(*args, **kwargs) + def Navigate(*args, **kwargs): + """ + Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool + + :param flags: A combination of the ``IsForward`` and ``WinChange`` + values in the `wx.NavigationKeyEvent` class, which + determine if the navigation should be in forward or + reverse order, and if it should be able to cross + parent window boundaries, such as between notebook + pages or MDI child frames. Typically the status of + the Shift key (for forward or reverse) or the + Control key (for WinChange) would be used to + determine how to set the flags. + + situation in which you may wish to call this method is from a text + rol custom keypress handler to do the default navigation behaviour + the tab key, since the standard default behaviour for a multiline + control with the wx.TE_PROCESS_TAB style is to insert a tab and + navigate to the next control. + """ + return _core_.Window_Navigate(*args, **kwargs) + def GetChildren(*args, **kwargs): """ GetChildren(self) -> PyObject @@ -8181,20 +8230,7 @@ class Control(Window): return _core_.Control_SetLabel(*args, **kwargs) def GetClassDefaultAttributes(*args, **kwargs): - """ - GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes - - Get the default attributes for this class. This is useful if you want - to use the same font or colour in your own control as in a standard - control -- which is a much better idea than hard coding specific - colours or fonts which might look completely out of place on the - user's system, especially if it uses themes. - - The variant parameter is only relevant under Mac currently and is - ignore under other platforms. Under Mac, it will change the size of - the returned font. See `wx.Window.SetWindowVariant` for more about - this. - """ + """GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes""" return _core_.Control_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) @@ -8218,20 +8254,7 @@ def PreControl(*args, **kwargs): return val def Control_GetClassDefaultAttributes(*args, **kwargs): - """ - Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes - - Get the default attributes for this class. This is useful if you want - to use the same font or colour in your own control as in a standard - control -- which is a much better idea than hard coding specific - colours or fonts which might look completely out of place on the - user's system, especially if it uses themes. - - The variant parameter is only relevant under Mac currently and is - ignore under other platforms. Under Mac, it will change the size of - the returned font. See `wx.Window.SetWindowVariant` for more about - this. - """ + """Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes""" return _core_.Control_GetClassDefaultAttributes(*args, **kwargs) #--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 910a72b325..b2a33b085c 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -18606,7 +18606,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "bForward", NULL + (char *) "self",(char *) "forward", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail; @@ -18663,7 +18663,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "bIs", NULL + (char *) "self",(char *) "ischange", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail; @@ -18685,6 +18685,35 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje } +static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ; + long arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (long) SWIG_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetFlags(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ; @@ -22993,6 +23022,55 @@ static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + wxSize temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -23046,55 +23124,6 @@ static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *arg } -static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize *arg2 = 0 ; - wxSize const &arg3_defvalue = wxDefaultSize ; - wxSize *arg3 = (wxSize *) &arg3_defvalue ; - wxSize const &arg4_defvalue = wxDefaultSize ; - wxSize *arg4 = (wxSize *) &arg4_defvalue ; - wxSize temp2 ; - wxSize temp3 ; - wxSize temp4 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - if (obj2) { - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } - } - if (obj3) { - { - arg4 = &temp4; - if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { int argc; PyObject *argv[8]; @@ -23121,20 +23150,20 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { } if (_v) { if (argc <= 2) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); } if (_v) { if (argc <= 3) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[3], wxT("wxSize"), 2); } if (_v) { - return _wrap_Window_SetSizeHints__SWIG_1(self,args); + return _wrap_Window_SetSizeHints__SWIG_0(self,args); } } } @@ -23157,26 +23186,26 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { _v = SWIG_CheckInt(argv[2]); if (_v) { if (argc <= 3) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[3]); if (_v) { if (argc <= 4) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[4]); if (_v) { if (argc <= 5) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[5]); if (_v) { if (argc <= 6) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[6]); if (_v) { - return _wrap_Window_SetSizeHints__SWIG_0(self,args); + return _wrap_Window_SetSizeHints__SWIG_1(self,args); } } } @@ -23192,6 +23221,45 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -23233,45 +23301,6 @@ static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObje } -static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize *arg2 = 0 ; - wxSize const &arg3_defvalue = wxDefaultSize ; - wxSize *arg3 = (wxSize *) &arg3_defvalue ; - wxSize temp2 ; - wxSize temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - if (obj2) { - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args) { int argc; PyObject *argv[6]; @@ -23298,13 +23327,13 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } if (_v) { if (argc <= 2) { - return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); } { _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); } if (_v) { - return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); } } } @@ -23326,16 +23355,16 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args _v = SWIG_CheckInt(argv[2]); if (_v) { if (argc <= 3) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[3]); if (_v) { if (argc <= 4) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } _v = SWIG_CheckInt(argv[4]); if (_v) { - return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); } } } @@ -23348,6 +23377,130 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } +static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMaxSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMinSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "minSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMinSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMinSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "maxSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetMaxSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetMaxSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -23452,66 +23605,6 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetMaxSize(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, - SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetMinSize(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -24334,6 +24427,40 @@ static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *self, PyObject *args, } +static PyObject *_wrap_Window_Navigate(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) wxNavigationKeyEvent::IsForward ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_Navigate",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Navigate(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_Window_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -33448,12 +33575,11 @@ static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *self, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxControl::GetClassDefaultAttributes((wxWindowVariant )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxVisualAttributes * resultptr; @@ -40829,6 +40955,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"NavigationKeyEvent_SetDirection", (PyCFunction) _wrap_NavigationKeyEvent_SetDirection, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_IsWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_IsWindowChange, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_SetWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_SetWindowChange, METH_VARARGS | METH_KEYWORDS }, + { (char *)"NavigationKeyEvent_SetFlags", (PyCFunction) _wrap_NavigationKeyEvent_SetFlags, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_GetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_GetCurrentFocus, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS }, { (char *)"NavigationKeyEvent_swigregister", NavigationKeyEvent_swigregister, METH_VARARGS }, @@ -40982,12 +41109,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetSizeHints", _wrap_Window_SetSizeHints, METH_VARARGS }, { (char *)"Window_SetVirtualSizeHints", _wrap_Window_SetVirtualSizeHints, METH_VARARGS }, + { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetMinSize", (PyCFunction) _wrap_Window_SetMinSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetMaxSize", (PyCFunction) _wrap_Window_SetMaxSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS }, @@ -41016,6 +41145,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetDefaultItem", (PyCFunction) _wrap_Window_GetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetDefaultItem", (PyCFunction) _wrap_Window_SetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetTmpDefaultItem", (PyCFunction) _wrap_Window_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_Navigate", (PyCFunction) _wrap_Window_Navigate, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetChildren", (PyCFunction) _wrap_Window_GetChildren, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetParent", (PyCFunction) _wrap_Window_GetParent, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetGrandParent", (PyCFunction) _wrap_Window_GetGrandParent, METH_VARARGS | METH_KEYWORDS }, @@ -42967,6 +43097,8 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward)); + PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange)); PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL)); PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_FromInt((int)wxIDLE_PROCESS_SPECIFIED)); PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_FromInt((int)wxPYAPP_ASSERT_SUPPRESS));