X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/248ed9435a7aa3454bbeed1156bc4302581f99a2..329b045c615ff0a40a7bbaf1440a262b1d702d0d:/wxPython/src/msw/_core_wrap.cpp diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index e4a6d1889c..c59c1f4d5c 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 ; @@ -22306,6 +22335,41 @@ static PyObject *_wrap_Window_MoveXY(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_Window_SetBestFittingSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize const &arg2_defvalue = wxDefaultSize ; + wxSize *arg2 = (wxSize *) &arg2_defvalue ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_SetBestFittingSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj1) { + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetBestFittingSize((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_Raise(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -22993,6 +23057,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 +23159,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 +23185,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 +23221,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,34 +23258,31 @@ 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 ; - int arg2 ; - int arg3 ; - int arg4 = (int) -1 ; - int arg5 = (int) -1 ; + 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 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO|OO:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + 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 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - if (obj3) { - arg4 = (int) SWIG_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } - if (obj4) { - arg5 = (int) SWIG_AsInt(obj4); - if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetVirtualSizeHints(arg2,arg3,arg4,arg5); + (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23236,31 +23297,34 @@ 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 ; + int arg2 ; + int arg3 ; + int arg4 = (int) -1 ; + int arg5 = (int) -1 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO|OO:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2,&obj3,&obj4)) 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; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } - if (obj2) { - { - arg3 = &temp3; - if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; - } + if (obj4) { + arg5 = (int) SWIG_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); + (arg1)->SetVirtualSizeHints(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23298,13 +23362,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 +23390,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,59 +23412,131 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } -static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int result; + wxSize result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinWidth",kwnames,&obj0)) goto fail; + 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 = (int)((wxWindow const *)arg1)->GetMinWidth(); + result = ((wxWindow const *)arg1)->GetMaxSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + { + 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_GetMinHeight(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int result; + wxSize result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinHeight",kwnames,&obj0)) goto fail; + 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 = (int)((wxWindow const *)arg1)->GetMinHeight(); + result = ((wxWindow const *)arg1)->GetMinSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_FromInt((int)result); + { + 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_GetMaxWidth(PyObject *self, PyObject *args, PyObject *kwargs) { +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 ; int result; @@ -23409,12 +23545,12 @@ static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxWidth",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinWidth",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxWindow const *)arg1)->GetMaxWidth(); + result = (int)((wxWindow const *)arg1)->GetMinWidth(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23426,7 +23562,7 @@ static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_GetMinHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int result; @@ -23435,12 +23571,12 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxHeight",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinHeight",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxWindow const *)arg1)->GetMaxHeight(); + result = (int)((wxWindow const *)arg1)->GetMinHeight(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23452,60 +23588,52 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxWidth",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(); + result = (int)((wxWindow const *)arg1)->GetMaxWidth(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxSize result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMaxHeight",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(); + result = (int)((wxWindow const *)arg1)->GetMaxHeight(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } + resultobj = SWIG_FromInt((int)result); return resultobj; fail: return NULL; @@ -24334,6 +24462,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 ; @@ -26841,8 +27003,8 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxMenu *arg2 = (wxMenu *) 0 ; - int arg3 ; - int arg4 ; + int arg3 = (int) -1 ; + int arg4 = (int) -1 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -26852,15 +27014,19 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje (char *) "self",(char *) "menu",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_PopupMenuXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Window_PopupMenuXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - arg4 = (int) SWIG_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + arg4 = (int) SWIG_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->PopupMenu(arg2,arg3,arg4); @@ -26881,7 +27047,8 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxMenu *arg2 = (wxMenu *) 0 ; - wxPoint *arg3 = 0 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; bool result; wxPoint temp3 ; PyObject * obj0 = 0 ; @@ -26891,14 +27058,16 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject (char *) "self",(char *) "menu",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - { - arg3 = &temp3; - if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + if (obj2) { + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33426,6 +33595,63 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Control_GetAdjustMinSizeFlag(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxControl *arg1 = (wxControl *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Control_GetAdjustMinSizeFlag",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxControl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->GetAdjustMinSizeFlag(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Control_SetAdjustMinSizeFlag(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxControl *arg1 = (wxControl *) 0 ; + bool arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "adjust", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Control_SetAdjustMinSizeFlag",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxControl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetAdjustMinSizeFlag(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; @@ -33441,12 +33667,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; @@ -40822,6 +41047,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 }, @@ -40951,6 +41177,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_SetSizeWH", (PyCFunction) _wrap_Window_SetSizeWH, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Move", (PyCFunction) _wrap_Window_Move, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_MoveXY", (PyCFunction) _wrap_Window_MoveXY, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetBestFittingSize", (PyCFunction) _wrap_Window_SetBestFittingSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Raise", (PyCFunction) _wrap_Window_Raise, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Lower", (PyCFunction) _wrap_Window_Lower, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetClientSize", (PyCFunction) _wrap_Window_SetClientSize, METH_VARARGS | METH_KEYWORDS }, @@ -40975,12 +41202,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 }, @@ -41009,6 +41238,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 }, @@ -41271,6 +41501,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_GetLabel", (PyCFunction) _wrap_Control_GetLabel, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_SetLabel", (PyCFunction) _wrap_Control_SetLabel, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Control_GetAdjustMinSizeFlag", (PyCFunction) _wrap_Control_GetAdjustMinSizeFlag, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Control_SetAdjustMinSizeFlag", (PyCFunction) _wrap_Control_SetAdjustMinSizeFlag, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS }, { (char *)"ItemContainer_Append", (PyCFunction) _wrap_ItemContainer_Append, METH_VARARGS | METH_KEYWORDS }, @@ -42960,6 +43192,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));