From b02396e86fa089d576b5c70a2067a6559e653a50 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 27 Jun 2006 23:05:12 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_controls.py | 46 ++- wxPython/src/gtk/_controls_wrap.cpp | 490 +++++++++++++++++++++++++++- wxPython/src/gtk/_core.py | 4 + wxPython/src/gtk/_core_wrap.cpp | 57 ++++ wxPython/src/gtk/_misc.py | 35 ++ wxPython/src/gtk/_misc_wrap.cpp | 35 ++ wxPython/src/gtk/_windows.py | 1 + wxPython/src/gtk/_windows_wrap.cpp | 5 + wxPython/src/mac/_controls.py | 46 ++- wxPython/src/mac/_controls_wrap.cpp | 490 +++++++++++++++++++++++++++- wxPython/src/mac/_core.py | 4 + wxPython/src/mac/_core_wrap.cpp | 57 ++++ wxPython/src/mac/_misc.py | 35 ++ wxPython/src/mac/_misc_wrap.cpp | 35 ++ wxPython/src/mac/_windows.py | 1 + wxPython/src/mac/_windows_wrap.cpp | 5 + wxPython/src/msw/_controls.py | 46 ++- wxPython/src/msw/_controls_wrap.cpp | 490 +++++++++++++++++++++++++++- wxPython/src/msw/_core.py | 6 +- wxPython/src/msw/_core_wrap.cpp | 71 +++- wxPython/src/msw/_misc.py | 35 ++ wxPython/src/msw/_misc_wrap.cpp | 35 ++ wxPython/src/msw/_windows.py | 1 + wxPython/src/msw/_windows_wrap.cpp | 5 + 24 files changed, 1962 insertions(+), 73 deletions(-) diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index 6372308509..2b9f4d45a4 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -1751,6 +1751,10 @@ class TextCtrl(_core.Control): """DiscardEdits(self)""" return _controls_.TextCtrl_DiscardEdits(*args, **kwargs) + def SetModified(*args, **kwargs): + """SetModified(self, bool modified)""" + return _controls_.TextCtrl_SetModified(*args, **kwargs) + def SetMaxLength(*args, **kwargs): """SetMaxLength(self, unsigned long len)""" return _controls_.TextCtrl_SetMaxLength(*args, **kwargs) @@ -2970,6 +2974,7 @@ NB_HITTEST_NOWHERE = _controls_.NB_HITTEST_NOWHERE NB_HITTEST_ONICON = _controls_.NB_HITTEST_ONICON NB_HITTEST_ONLABEL = _controls_.NB_HITTEST_ONLABEL NB_HITTEST_ONITEM = _controls_.NB_HITTEST_ONITEM +NB_HITTEST_ONPAGE = _controls_.NB_HITTEST_ONPAGE class Notebook(BookCtrlBase): """Proxy of C++ Notebook class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -4898,9 +4903,12 @@ class TreeEvent(_core.NotifyEvent): """Proxy of C++ TreeEvent class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent""" - _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args, **kwargs)) + def __init__(self, *args): + """ + __init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent + __init__(self, EventType commandType, TreeCtrl tree, TreeItemId item=NullTreeItemId) -> TreeEvent + """ + _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args)) def GetItem(*args, **kwargs): """GetItem(self) -> TreeItemId""" return _controls_.TreeEvent_GetItem(*args, **kwargs) @@ -6389,6 +6397,22 @@ class PickerBase(_core.Control): """ return _controls_.PickerBase_GetTextCtrlProportion(*args, **kwargs) + def IsTextCtrlGrowable(*args, **kwargs): + """IsTextCtrlGrowable(self) -> bool""" + return _controls_.PickerBase_IsTextCtrlGrowable(*args, **kwargs) + + def SetTextCtrlGrowable(*args, **kwargs): + """SetTextCtrlGrowable(self, bool grow=True)""" + return _controls_.PickerBase_SetTextCtrlGrowable(*args, **kwargs) + + def IsPickerCtrlGrowable(*args, **kwargs): + """IsPickerCtrlGrowable(self) -> bool""" + return _controls_.PickerBase_IsPickerCtrlGrowable(*args, **kwargs) + + def SetPickerCtrlGrowable(*args, **kwargs): + """SetPickerCtrlGrowable(self, bool grow=True)""" + return _controls_.PickerBase_SetPickerCtrlGrowable(*args, **kwargs) + def HasTextCtrl(*args, **kwargs): """ HasTextCtrl(self) -> bool @@ -6559,6 +6583,14 @@ class FilePickerCtrl(PickerBase): """SetPath(self, String str)""" return _controls_.FilePickerCtrl_SetPath(*args, **kwargs) + def CheckPath(*args, **kwargs): + """CheckPath(self, String path) -> bool""" + return _controls_.FilePickerCtrl_CheckPath(*args, **kwargs) + + def GetTextCtrlValue(*args, **kwargs): + """GetTextCtrlValue(self) -> String""" + return _controls_.FilePickerCtrl_GetTextCtrlValue(*args, **kwargs) + _controls_.FilePickerCtrl_swigregister(FilePickerCtrl) FilePickerCtrlNameStr = cvar.FilePickerCtrlNameStr FileSelectorPromptStr = cvar.FileSelectorPromptStr @@ -6604,6 +6636,14 @@ class DirPickerCtrl(PickerBase): """SetPath(self, String str)""" return _controls_.DirPickerCtrl_SetPath(*args, **kwargs) + def CheckPath(*args, **kwargs): + """CheckPath(self, String path) -> bool""" + return _controls_.DirPickerCtrl_CheckPath(*args, **kwargs) + + def GetTextCtrlValue(*args, **kwargs): + """GetTextCtrlValue(self) -> String""" + return _controls_.DirPickerCtrl_GetTextCtrlValue(*args, **kwargs) + _controls_.DirPickerCtrl_swigregister(DirPickerCtrl) def PreDirPickerCtrl(*args, **kwargs): diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 72db6b4c40..4c14ba6993 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -3116,6 +3116,9 @@ SWIGINTERN wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){ SWIGINTERN bool wxTreeItemId___eq__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self == *other) : false; } SWIGINTERN bool wxTreeItemId___ne__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self != *other) : true; } SWIGINTERN void wxPyTreeItemData_Destroy(wxPyTreeItemData *self){ delete self; } + + static wxTreeItemId wxNullTreeItemId; + // C++ version of Python aware wxTreeCtrl class wxPyTreeCtrl : public wxTreeCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl) @@ -3358,12 +3361,6 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){ return rv; } static const wxString wxPyHyperlinkCtrlNameStr(wxHyperlinkCtrlNameStr); - -#include -#include -#include -#include - static const wxString wxPyColourPickerCtrlNameStr(wxColourPickerCtrlNameStr); static const wxString wxPyFilePickerCtrlNameStr(wxFilePickerCtrlNameStr); static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); @@ -12593,6 +12590,44 @@ fail: } +SWIGINTERN PyObject *_wrap_TextCtrl_SetModified(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "modified", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetModified",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TextCtrl_SetModified" "', expected argument " "1"" of type '" "wxTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TextCtrl_SetModified" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetModified(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; @@ -32823,7 +32858,37 @@ SWIGINTERN PyObject *TreeItemData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN int NullTreeItemId_set(PyObject *_val) { + { + void *argp = 0; + int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""wxNullTreeItemId""' of type '""wxTreeItemId""'"); + } + if (!argp) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""wxNullTreeItemId""' of type '""wxTreeItemId""'"); + } else { + wxTreeItemId * temp; + temp = reinterpret_cast< wxTreeItemId * >(argp); + wxNullTreeItemId = *temp; + if (SWIG_IsNewObj(res)) delete temp; + } + } + return 0; +fail: + return 1; +} + + +SWIGINTERN PyObject *NullTreeItemId_get(void) { + PyObject *pyobj = 0; + + pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullTreeItemId), SWIGTYPE_p_wxTreeItemId, 0 ); + return pyobj; +} + + +SWIGINTERN PyObject *_wrap_new_TreeEvent__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; @@ -32832,22 +32897,17 @@ SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *SWIGUNUSEDPARM(self), PyObjec int ecode1 = 0 ; int val2 ; int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "commandType",(char *) "id", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TreeEvent",kwnames,&obj0,&obj1)) SWIG_fail; - if (obj0) { - ecode1 = SWIG_AsVal_int(obj0, &val1); + if ((nobjs < 0) || (nobjs > 2)) SWIG_fail; + if (swig_obj[0]) { + ecode1 = SWIG_AsVal_int(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TreeEvent" "', expected argument " "1"" of type '" "wxEventType""'"); } arg1 = static_cast< wxEventType >(val1); } - if (obj1) { - ecode2 = SWIG_AsVal_int(obj1, &val2); + if (swig_obj[1]) { + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_TreeEvent" "', expected argument " "2"" of type '" "int""'"); } @@ -32866,6 +32926,85 @@ fail: } +SWIGINTERN PyObject *_wrap_new_TreeEvent__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxEventType arg1 ; + wxPyTreeCtrl *arg2 = (wxPyTreeCtrl *) 0 ; + wxTreeItemId &arg3_defvalue = wxNullTreeItemId ; + wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; + wxTreeEvent *result = 0 ; + int val1 ; + int ecode1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + + if ((nobjs < 2) || (nobjs > 3)) SWIG_fail; + ecode1 = SWIG_AsVal_int(swig_obj[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TreeEvent" "', expected argument " "1"" of type '" "wxEventType""'"); + } + arg1 = static_cast< wxEventType >(val1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxPyTreeCtrl, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_TreeEvent" "', expected argument " "2"" of type '" "wxPyTreeCtrl *""'"); + } + arg2 = reinterpret_cast< wxPyTreeCtrl * >(argp2); + if (swig_obj[2]) { + res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_wxTreeItemId, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_TreeEvent" "', expected argument " "3"" of type '" "wxTreeItemId &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_TreeEvent" "', expected argument " "3"" of type '" "wxTreeItemId &""'"); + } + arg3 = reinterpret_cast< wxTreeItemId * >(argp3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreeEvent *)new wxTreeEvent(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeEvent, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_TreeEvent",0,3,argv))) SWIG_fail; + --argc; + if ((argc >= 0) && (argc <= 2)) { + int _v = 0; + if (argc > 1) { + { + { + int res = SWIG_AsVal_int(argv[1], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + } + return _wrap_new_TreeEvent__SWIG_0(self, argc, argv); + } +check_1: + + if ((argc >= 2) && (argc <= 3)) { + return _wrap_new_TreeEvent__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_TreeEvent'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeEvent_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeEvent *arg1 = (wxTreeEvent *) 0 ; @@ -42329,6 +42468,146 @@ fail: } +SWIGINTERN PyObject *_wrap_PickerBase_IsTextCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_IsTextCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase const *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPickerBase const *)arg1)->IsTextCtrlGrowable(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_SetTextCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool arg2 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grow", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PickerBase_SetTextCtrlGrowable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_SetTextCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PickerBase_SetTextCtrlGrowable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetTextCtrlGrowable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_IsPickerCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_IsPickerCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase const *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPickerBase const *)arg1)->IsPickerCtrlGrowable(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_SetPickerCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool arg2 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grow", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PickerBase_SetPickerCtrlGrowable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_SetPickerCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PickerBase_SetPickerCtrlGrowable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPickerCtrlGrowable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_PickerBase_HasTextCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPickerBase *arg1 = (wxPickerBase *) 0 ; @@ -43439,6 +43718,88 @@ fail: } +SWIGINTERN PyObject *_wrap_FilePickerCtrl_CheckPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxFilePickerCtrl *arg1 = (wxFilePickerCtrl *) 0 ; + wxString *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "path", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FilePickerCtrl_CheckPath",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFilePickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FilePickerCtrl_CheckPath" "', expected argument " "1"" of type '" "wxFilePickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxFilePickerCtrl * >(argp1); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxFilePickerCtrl const *)arg1)->CheckPath((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_FilePickerCtrl_GetTextCtrlValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxFilePickerCtrl *arg1 = (wxFilePickerCtrl *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFilePickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FilePickerCtrl_GetTextCtrlValue" "', expected argument " "1"" of type '" "wxFilePickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxFilePickerCtrl * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxFilePickerCtrl const *)arg1)->GetTextCtrlValue(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *FilePickerCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -43848,6 +44209,88 @@ fail: } +SWIGINTERN PyObject *_wrap_DirPickerCtrl_CheckPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDirPickerCtrl *arg1 = (wxDirPickerCtrl *) 0 ; + wxString *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "path", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DirPickerCtrl_CheckPath",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDirPickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirPickerCtrl_CheckPath" "', expected argument " "1"" of type '" "wxDirPickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxDirPickerCtrl * >(argp1); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxDirPickerCtrl const *)arg1)->CheckPath((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_DirPickerCtrl_GetTextCtrlValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxDirPickerCtrl *arg1 = (wxDirPickerCtrl *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDirPickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirPickerCtrl_GetTextCtrlValue" "', expected argument " "1"" of type '" "wxDirPickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxDirPickerCtrl * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxDirPickerCtrl const *)arg1)->GetTextCtrlValue(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *DirPickerCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -44795,6 +45238,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TextCtrl_SaveFile", (PyCFunction) _wrap_TextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_MarkDirty", (PyCFunction)_wrap_TextCtrl_MarkDirty, METH_O, NULL}, { (char *)"TextCtrl_DiscardEdits", (PyCFunction)_wrap_TextCtrl_DiscardEdits, METH_O, NULL}, + { (char *)"TextCtrl_SetModified", (PyCFunction) _wrap_TextCtrl_SetModified, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_SetMaxLength", (PyCFunction) _wrap_TextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_WriteText", (PyCFunction) _wrap_TextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_AppendText", (PyCFunction) _wrap_TextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45325,7 +45769,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeItemData_Destroy", (PyCFunction)_wrap_TreeItemData_Destroy, METH_O, NULL}, { (char *)"TreeItemData_swigregister", TreeItemData_swigregister, METH_VARARGS, NULL}, { (char *)"TreeItemData_swiginit", TreeItemData_swiginit, METH_VARARGS, NULL}, - { (char *)"new_TreeEvent", (PyCFunction) _wrap_new_TreeEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_TreeEvent", _wrap_new_TreeEvent, METH_VARARGS, NULL}, { (char *)"TreeEvent_GetItem", (PyCFunction)_wrap_TreeEvent_GetItem, METH_O, NULL}, { (char *)"TreeEvent_SetItem", (PyCFunction) _wrap_TreeEvent_SetItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeEvent_GetOldItem", (PyCFunction)_wrap_TreeEvent_GetOldItem, METH_O, NULL}, @@ -45558,6 +46002,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"PickerBase_GetInternalMargin", (PyCFunction)_wrap_PickerBase_GetInternalMargin, METH_O, NULL}, { (char *)"PickerBase_SetTextCtrlProportion", (PyCFunction) _wrap_PickerBase_SetTextCtrlProportion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PickerBase_GetTextCtrlProportion", (PyCFunction)_wrap_PickerBase_GetTextCtrlProportion, METH_O, NULL}, + { (char *)"PickerBase_IsTextCtrlGrowable", (PyCFunction)_wrap_PickerBase_IsTextCtrlGrowable, METH_O, NULL}, + { (char *)"PickerBase_SetTextCtrlGrowable", (PyCFunction) _wrap_PickerBase_SetTextCtrlGrowable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PickerBase_IsPickerCtrlGrowable", (PyCFunction)_wrap_PickerBase_IsPickerCtrlGrowable, METH_O, NULL}, + { (char *)"PickerBase_SetPickerCtrlGrowable", (PyCFunction) _wrap_PickerBase_SetPickerCtrlGrowable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PickerBase_HasTextCtrl", (PyCFunction)_wrap_PickerBase_HasTextCtrl, METH_O, NULL}, { (char *)"PickerBase_GetTextCtrl", (PyCFunction)_wrap_PickerBase_GetTextCtrl, METH_O, NULL}, { (char *)"PickerBase_GetPickerCtrl", (PyCFunction)_wrap_PickerBase_GetPickerCtrl, METH_O, NULL}, @@ -45579,6 +46027,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"FilePickerCtrl_Create", (PyCFunction) _wrap_FilePickerCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FilePickerCtrl_GetPath", (PyCFunction)_wrap_FilePickerCtrl_GetPath, METH_O, NULL}, { (char *)"FilePickerCtrl_SetPath", (PyCFunction) _wrap_FilePickerCtrl_SetPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FilePickerCtrl_CheckPath", (PyCFunction) _wrap_FilePickerCtrl_CheckPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FilePickerCtrl_GetTextCtrlValue", (PyCFunction)_wrap_FilePickerCtrl_GetTextCtrlValue, METH_O, NULL}, { (char *)"FilePickerCtrl_swigregister", FilePickerCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"FilePickerCtrl_swiginit", FilePickerCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_DirPickerCtrl", (PyCFunction) _wrap_new_DirPickerCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45586,6 +46036,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"DirPickerCtrl_Create", (PyCFunction) _wrap_DirPickerCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DirPickerCtrl_GetPath", (PyCFunction)_wrap_DirPickerCtrl_GetPath, METH_O, NULL}, { (char *)"DirPickerCtrl_SetPath", (PyCFunction) _wrap_DirPickerCtrl_SetPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DirPickerCtrl_CheckPath", (PyCFunction) _wrap_DirPickerCtrl_CheckPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DirPickerCtrl_GetTextCtrlValue", (PyCFunction)_wrap_DirPickerCtrl_GetTextCtrlValue, METH_O, NULL}, { (char *)"DirPickerCtrl_swigregister", DirPickerCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"DirPickerCtrl_swiginit", DirPickerCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_FileDirPickerEvent", (PyCFunction) _wrap_new_FileDirPickerEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -48127,6 +48579,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "NB_HITTEST_ONICON",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONICON))); SWIG_Python_SetConstant(d, "NB_HITTEST_ONLABEL",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONLABEL))); SWIG_Python_SetConstant(d, "NB_HITTEST_ONITEM",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONITEM))); + SWIG_Python_SetConstant(d, "NB_HITTEST_ONPAGE",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONPAGE))); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); SWIG_Python_SetConstant(d, "LB_DEFAULT",SWIG_From_int(static_cast< int >(wxLB_DEFAULT))); @@ -48315,6 +48768,7 @@ SWIGEXPORT void SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK", PyInt_FromLong(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP", PyInt_FromLong(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_ITEM_MENU", PyInt_FromLong(wxEVT_COMMAND_TREE_ITEM_MENU)); + SWIG_addvarlink(SWIG_globals(),(char*)"NullTreeItemId",NullTreeItemId_get, NullTreeItemId_set); // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData"); diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 4f2165ed71..d9b7415366 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -1982,6 +1982,10 @@ class ImageHandler(Object): """CanRead(self, String name) -> bool""" return _core_.ImageHandler_CanRead(*args, **kwargs) + def CanReadStream(*args, **kwargs): + """CanReadStream(self, InputStream stream) -> bool""" + return _core_.ImageHandler_CanReadStream(*args, **kwargs) + def SetName(*args, **kwargs): """SetName(self, String name)""" return _core_.ImageHandler_SetName(*args, **kwargs) diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index e9ffb28d52..d5a5ee1296 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -11862,6 +11862,62 @@ fail: } +SWIGINTERN PyObject *_wrap_ImageHandler_CanReadStream(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxImageHandler *arg1 = (wxImageHandler *) 0 ; + wxInputStream *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + wxPyInputStream *temp2 ; + bool created2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "stream", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_CanReadStream",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageHandler, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageHandler_CanReadStream" "', expected argument " "1"" of type '" "wxImageHandler *""'"); + } + arg1 = reinterpret_cast< wxImageHandler * >(argp1); + { + if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { + arg2 = temp2->m_wxis; + created2 = false; + } else { + PyErr_Clear(); // clear the failure of the wxPyConvert above + arg2 = wxPyCBInputStream_create(obj1, false); + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); + SWIG_fail; + } + created2 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->CanRead(*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (created2) delete arg2; + } + return resultobj; +fail: + { + if (created2) delete arg2; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_ImageHandler_SetName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxImageHandler *arg1 = (wxImageHandler *) 0 ; @@ -52894,6 +52950,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ImageHandler_GetType", (PyCFunction)_wrap_ImageHandler_GetType, METH_O, NULL}, { (char *)"ImageHandler_GetMimeType", (PyCFunction)_wrap_ImageHandler_GetMimeType, METH_O, NULL}, { (char *)"ImageHandler_CanRead", (PyCFunction) _wrap_ImageHandler_CanRead, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ImageHandler_CanReadStream", (PyCFunction) _wrap_ImageHandler_CanReadStream, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetName", (PyCFunction) _wrap_ImageHandler_SetName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetExtension", (PyCFunction) _wrap_ImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetType", (PyCFunction) _wrap_ImageHandler_SetType, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index b3b794c226..ff6376fe07 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -328,6 +328,41 @@ def Shell(*args, **kwargs): def StartTimer(*args): """StartTimer()""" return _misc_.StartTimer(*args) +UNKNOWN_PLATFORM = _misc_.UNKNOWN_PLATFORM +CURSES = _misc_.CURSES +XVIEW_X = _misc_.XVIEW_X +MOTIF_X = _misc_.MOTIF_X +COSE_X = _misc_.COSE_X +NEXTSTEP = _misc_.NEXTSTEP +MAC = _misc_.MAC +MAC_DARWIN = _misc_.MAC_DARWIN +BEOS = _misc_.BEOS +GTK = _misc_.GTK +GTK_WIN32 = _misc_.GTK_WIN32 +GTK_OS2 = _misc_.GTK_OS2 +GTK_BEOS = _misc_.GTK_BEOS +GEOS = _misc_.GEOS +OS2_PM = _misc_.OS2_PM +WINDOWS = _misc_.WINDOWS +MICROWINDOWS = _misc_.MICROWINDOWS +PENWINDOWS = _misc_.PENWINDOWS +WINDOWS_NT = _misc_.WINDOWS_NT +WIN32S = _misc_.WIN32S +WIN95 = _misc_.WIN95 +WIN386 = _misc_.WIN386 +WINDOWS_CE = _misc_.WINDOWS_CE +WINDOWS_POCKETPC = _misc_.WINDOWS_POCKETPC +WINDOWS_SMARTPHONE = _misc_.WINDOWS_SMARTPHONE +MGL_UNIX = _misc_.MGL_UNIX +MGL_X = _misc_.MGL_X +MGL_WIN32 = _misc_.MGL_WIN32 +MGL_OS2 = _misc_.MGL_OS2 +MGL_DOS = _misc_.MGL_DOS +WINDOWS_OS2 = _misc_.WINDOWS_OS2 +UNIX = _misc_.UNIX +X11 = _misc_.X11 +PALMOS = _misc_.PALMOS +DOS = _misc_.DOS def GetOsVersion(*args): """GetOsVersion() -> (platform, major, minor)""" diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 2918d7c350..2de91f5e13 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -38820,6 +38820,41 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorPromptStr",FileSelectorPromptStr_get, FileSelectorPromptStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"DirSelectorPromptStr",DirSelectorPromptStr_get, DirSelectorPromptStr_set); + SWIG_Python_SetConstant(d, "UNKNOWN_PLATFORM",SWIG_From_int(static_cast< int >(wxUNKNOWN_PLATFORM))); + SWIG_Python_SetConstant(d, "CURSES",SWIG_From_int(static_cast< int >(wxCURSES))); + SWIG_Python_SetConstant(d, "XVIEW_X",SWIG_From_int(static_cast< int >(wxXVIEW_X))); + SWIG_Python_SetConstant(d, "MOTIF_X",SWIG_From_int(static_cast< int >(wxMOTIF_X))); + SWIG_Python_SetConstant(d, "COSE_X",SWIG_From_int(static_cast< int >(wxCOSE_X))); + SWIG_Python_SetConstant(d, "NEXTSTEP",SWIG_From_int(static_cast< int >(wxNEXTSTEP))); + SWIG_Python_SetConstant(d, "MAC",SWIG_From_int(static_cast< int >(wxMAC))); + SWIG_Python_SetConstant(d, "MAC_DARWIN",SWIG_From_int(static_cast< int >(wxMAC_DARWIN))); + SWIG_Python_SetConstant(d, "BEOS",SWIG_From_int(static_cast< int >(wxBEOS))); + SWIG_Python_SetConstant(d, "GTK",SWIG_From_int(static_cast< int >(wxGTK))); + SWIG_Python_SetConstant(d, "GTK_WIN32",SWIG_From_int(static_cast< int >(wxGTK_WIN32))); + SWIG_Python_SetConstant(d, "GTK_OS2",SWIG_From_int(static_cast< int >(wxGTK_OS2))); + SWIG_Python_SetConstant(d, "GTK_BEOS",SWIG_From_int(static_cast< int >(wxGTK_BEOS))); + SWIG_Python_SetConstant(d, "GEOS",SWIG_From_int(static_cast< int >(wxGEOS))); + SWIG_Python_SetConstant(d, "OS2_PM",SWIG_From_int(static_cast< int >(wxOS2_PM))); + SWIG_Python_SetConstant(d, "WINDOWS",SWIG_From_int(static_cast< int >(wxWINDOWS))); + SWIG_Python_SetConstant(d, "MICROWINDOWS",SWIG_From_int(static_cast< int >(wxMICROWINDOWS))); + SWIG_Python_SetConstant(d, "PENWINDOWS",SWIG_From_int(static_cast< int >(wxPENWINDOWS))); + SWIG_Python_SetConstant(d, "WINDOWS_NT",SWIG_From_int(static_cast< int >(wxWINDOWS_NT))); + SWIG_Python_SetConstant(d, "WIN32S",SWIG_From_int(static_cast< int >(wxWIN32S))); + SWIG_Python_SetConstant(d, "WIN95",SWIG_From_int(static_cast< int >(wxWIN95))); + SWIG_Python_SetConstant(d, "WIN386",SWIG_From_int(static_cast< int >(wxWIN386))); + SWIG_Python_SetConstant(d, "WINDOWS_CE",SWIG_From_int(static_cast< int >(wxWINDOWS_CE))); + SWIG_Python_SetConstant(d, "WINDOWS_POCKETPC",SWIG_From_int(static_cast< int >(wxWINDOWS_POCKETPC))); + SWIG_Python_SetConstant(d, "WINDOWS_SMARTPHONE",SWIG_From_int(static_cast< int >(wxWINDOWS_SMARTPHONE))); + SWIG_Python_SetConstant(d, "MGL_UNIX",SWIG_From_int(static_cast< int >(wxMGL_UNIX))); + SWIG_Python_SetConstant(d, "MGL_X",SWIG_From_int(static_cast< int >(wxMGL_X))); + SWIG_Python_SetConstant(d, "MGL_WIN32",SWIG_From_int(static_cast< int >(wxMGL_WIN32))); + SWIG_Python_SetConstant(d, "MGL_OS2",SWIG_From_int(static_cast< int >(wxMGL_OS2))); + SWIG_Python_SetConstant(d, "MGL_DOS",SWIG_From_int(static_cast< int >(wxMGL_DOS))); + SWIG_Python_SetConstant(d, "WINDOWS_OS2",SWIG_From_int(static_cast< int >(wxWINDOWS_OS2))); + SWIG_Python_SetConstant(d, "UNIX",SWIG_From_int(static_cast< int >(wxUNIX))); + SWIG_Python_SetConstant(d, "X11",SWIG_From_int(static_cast< int >(wxX11))); + SWIG_Python_SetConstant(d, "PALMOS",SWIG_From_int(static_cast< int >(wxPALMOS))); + SWIG_Python_SetConstant(d, "DOS",SWIG_From_int(static_cast< int >(wxDOS))); SWIG_Python_SetConstant(d, "SHUTDOWN_POWEROFF",SWIG_From_int(static_cast< int >(wxSHUTDOWN_POWEROFF))); SWIG_Python_SetConstant(d, "SHUTDOWN_REBOOT",SWIG_From_int(static_cast< int >(wxSHUTDOWN_REBOOT))); SWIG_Python_SetConstant(d, "TIMER_CONTINUOUS",SWIG_From_int(static_cast< int >(wxTIMER_CONTINUOUS))); diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 3584dea91b..2aa2776b75 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -2201,6 +2201,7 @@ OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST MULTIPLE = _windows_.MULTIPLE CHANGE_DIR = _windows_.CHANGE_DIR +HIDE_READONLY = _windows_.HIDE_READONLY FD_OPEN = _windows_.FD_OPEN FD_SAVE = _windows_.FD_SAVE FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp index 3e4b043840..3c34ad7d33 100644 --- a/wxPython/src/gtk/_windows_wrap.cpp +++ b/wxPython/src/gtk/_windows_wrap.cpp @@ -3222,6 +3222,10 @@ SWIGINTERN void wxPyTaskBarIcon_Destroy(wxPyTaskBarIcon *self){ static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyGetTextFromUserPromptStr(wxGetTextFromUserPromptStr); static const wxString wxPyMessageBoxCaptionStr(wxMessageBoxCaptionStr); + +// for compatibility only +#define wxHIDE_READONLY 0 + SWIGINTERN PyObject *wxFileDialog_GetFilenames(wxFileDialog *self){ wxArrayString arr; self->GetFilenames(arr); @@ -33608,6 +33612,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST))); SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE))); SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR))); + SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY))); SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN))); SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE))); SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT))); diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 549463444f..aa018c4c78 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -1738,6 +1738,10 @@ class TextCtrl(_core.Control): """DiscardEdits(self)""" return _controls_.TextCtrl_DiscardEdits(*args, **kwargs) + def SetModified(*args, **kwargs): + """SetModified(self, bool modified)""" + return _controls_.TextCtrl_SetModified(*args, **kwargs) + def SetMaxLength(*args, **kwargs): """SetMaxLength(self, unsigned long len)""" return _controls_.TextCtrl_SetMaxLength(*args, **kwargs) @@ -2957,6 +2961,7 @@ NB_HITTEST_NOWHERE = _controls_.NB_HITTEST_NOWHERE NB_HITTEST_ONICON = _controls_.NB_HITTEST_ONICON NB_HITTEST_ONLABEL = _controls_.NB_HITTEST_ONLABEL NB_HITTEST_ONITEM = _controls_.NB_HITTEST_ONITEM +NB_HITTEST_ONPAGE = _controls_.NB_HITTEST_ONPAGE class Notebook(BookCtrlBase): """Proxy of C++ Notebook class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -4885,9 +4890,12 @@ class TreeEvent(_core.NotifyEvent): """Proxy of C++ TreeEvent class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent""" - _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args, **kwargs)) + def __init__(self, *args): + """ + __init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent + __init__(self, EventType commandType, TreeCtrl tree, TreeItemId item=NullTreeItemId) -> TreeEvent + """ + _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args)) def GetItem(*args, **kwargs): """GetItem(self) -> TreeItemId""" return _controls_.TreeEvent_GetItem(*args, **kwargs) @@ -6376,6 +6384,22 @@ class PickerBase(_core.Control): """ return _controls_.PickerBase_GetTextCtrlProportion(*args, **kwargs) + def IsTextCtrlGrowable(*args, **kwargs): + """IsTextCtrlGrowable(self) -> bool""" + return _controls_.PickerBase_IsTextCtrlGrowable(*args, **kwargs) + + def SetTextCtrlGrowable(*args, **kwargs): + """SetTextCtrlGrowable(self, bool grow=True)""" + return _controls_.PickerBase_SetTextCtrlGrowable(*args, **kwargs) + + def IsPickerCtrlGrowable(*args, **kwargs): + """IsPickerCtrlGrowable(self) -> bool""" + return _controls_.PickerBase_IsPickerCtrlGrowable(*args, **kwargs) + + def SetPickerCtrlGrowable(*args, **kwargs): + """SetPickerCtrlGrowable(self, bool grow=True)""" + return _controls_.PickerBase_SetPickerCtrlGrowable(*args, **kwargs) + def HasTextCtrl(*args, **kwargs): """ HasTextCtrl(self) -> bool @@ -6546,6 +6570,14 @@ class FilePickerCtrl(PickerBase): """SetPath(self, String str)""" return _controls_.FilePickerCtrl_SetPath(*args, **kwargs) + def CheckPath(*args, **kwargs): + """CheckPath(self, String path) -> bool""" + return _controls_.FilePickerCtrl_CheckPath(*args, **kwargs) + + def GetTextCtrlValue(*args, **kwargs): + """GetTextCtrlValue(self) -> String""" + return _controls_.FilePickerCtrl_GetTextCtrlValue(*args, **kwargs) + _controls_.FilePickerCtrl_swigregister(FilePickerCtrl) FilePickerCtrlNameStr = cvar.FilePickerCtrlNameStr FileSelectorPromptStr = cvar.FileSelectorPromptStr @@ -6591,6 +6623,14 @@ class DirPickerCtrl(PickerBase): """SetPath(self, String str)""" return _controls_.DirPickerCtrl_SetPath(*args, **kwargs) + def CheckPath(*args, **kwargs): + """CheckPath(self, String path) -> bool""" + return _controls_.DirPickerCtrl_CheckPath(*args, **kwargs) + + def GetTextCtrlValue(*args, **kwargs): + """GetTextCtrlValue(self) -> String""" + return _controls_.DirPickerCtrl_GetTextCtrlValue(*args, **kwargs) + _controls_.DirPickerCtrl_swigregister(DirPickerCtrl) def PreDirPickerCtrl(*args, **kwargs): diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 557cb941f0..79740c2a47 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -3116,6 +3116,9 @@ SWIGINTERN wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){ SWIGINTERN bool wxTreeItemId___eq__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self == *other) : false; } SWIGINTERN bool wxTreeItemId___ne__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self != *other) : true; } SWIGINTERN void wxPyTreeItemData_Destroy(wxPyTreeItemData *self){ delete self; } + + static wxTreeItemId wxNullTreeItemId; + // C++ version of Python aware wxTreeCtrl class wxPyTreeCtrl : public wxTreeCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl) @@ -3358,12 +3361,6 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){ return rv; } static const wxString wxPyHyperlinkCtrlNameStr(wxHyperlinkCtrlNameStr); - -#include -#include -#include -#include - static const wxString wxPyColourPickerCtrlNameStr(wxColourPickerCtrlNameStr); static const wxString wxPyFilePickerCtrlNameStr(wxFilePickerCtrlNameStr); static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); @@ -12518,6 +12515,44 @@ fail: } +SWIGINTERN PyObject *_wrap_TextCtrl_SetModified(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "modified", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetModified",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TextCtrl_SetModified" "', expected argument " "1"" of type '" "wxTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TextCtrl_SetModified" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetModified(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; @@ -32748,7 +32783,37 @@ SWIGINTERN PyObject *TreeItemData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN int NullTreeItemId_set(PyObject *_val) { + { + void *argp = 0; + int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""wxNullTreeItemId""' of type '""wxTreeItemId""'"); + } + if (!argp) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""wxNullTreeItemId""' of type '""wxTreeItemId""'"); + } else { + wxTreeItemId * temp; + temp = reinterpret_cast< wxTreeItemId * >(argp); + wxNullTreeItemId = *temp; + if (SWIG_IsNewObj(res)) delete temp; + } + } + return 0; +fail: + return 1; +} + + +SWIGINTERN PyObject *NullTreeItemId_get(void) { + PyObject *pyobj = 0; + + pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullTreeItemId), SWIGTYPE_p_wxTreeItemId, 0 ); + return pyobj; +} + + +SWIGINTERN PyObject *_wrap_new_TreeEvent__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; @@ -32757,22 +32822,17 @@ SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *SWIGUNUSEDPARM(self), PyObjec int ecode1 = 0 ; int val2 ; int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "commandType",(char *) "id", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TreeEvent",kwnames,&obj0,&obj1)) SWIG_fail; - if (obj0) { - ecode1 = SWIG_AsVal_int(obj0, &val1); + if ((nobjs < 0) || (nobjs > 2)) SWIG_fail; + if (swig_obj[0]) { + ecode1 = SWIG_AsVal_int(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TreeEvent" "', expected argument " "1"" of type '" "wxEventType""'"); } arg1 = static_cast< wxEventType >(val1); } - if (obj1) { - ecode2 = SWIG_AsVal_int(obj1, &val2); + if (swig_obj[1]) { + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_TreeEvent" "', expected argument " "2"" of type '" "int""'"); } @@ -32791,6 +32851,85 @@ fail: } +SWIGINTERN PyObject *_wrap_new_TreeEvent__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxEventType arg1 ; + wxPyTreeCtrl *arg2 = (wxPyTreeCtrl *) 0 ; + wxTreeItemId &arg3_defvalue = wxNullTreeItemId ; + wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; + wxTreeEvent *result = 0 ; + int val1 ; + int ecode1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + + if ((nobjs < 2) || (nobjs > 3)) SWIG_fail; + ecode1 = SWIG_AsVal_int(swig_obj[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TreeEvent" "', expected argument " "1"" of type '" "wxEventType""'"); + } + arg1 = static_cast< wxEventType >(val1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxPyTreeCtrl, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_TreeEvent" "', expected argument " "2"" of type '" "wxPyTreeCtrl *""'"); + } + arg2 = reinterpret_cast< wxPyTreeCtrl * >(argp2); + if (swig_obj[2]) { + res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_wxTreeItemId, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_TreeEvent" "', expected argument " "3"" of type '" "wxTreeItemId &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_TreeEvent" "', expected argument " "3"" of type '" "wxTreeItemId &""'"); + } + arg3 = reinterpret_cast< wxTreeItemId * >(argp3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreeEvent *)new wxTreeEvent(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeEvent, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_TreeEvent",0,3,argv))) SWIG_fail; + --argc; + if ((argc >= 0) && (argc <= 2)) { + int _v = 0; + if (argc > 1) { + { + { + int res = SWIG_AsVal_int(argv[1], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + } + return _wrap_new_TreeEvent__SWIG_0(self, argc, argv); + } +check_1: + + if ((argc >= 2) && (argc <= 3)) { + return _wrap_new_TreeEvent__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_TreeEvent'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeEvent_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeEvent *arg1 = (wxTreeEvent *) 0 ; @@ -42254,6 +42393,146 @@ fail: } +SWIGINTERN PyObject *_wrap_PickerBase_IsTextCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_IsTextCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase const *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPickerBase const *)arg1)->IsTextCtrlGrowable(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_SetTextCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool arg2 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grow", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PickerBase_SetTextCtrlGrowable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_SetTextCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PickerBase_SetTextCtrlGrowable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetTextCtrlGrowable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_IsPickerCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_IsPickerCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase const *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPickerBase const *)arg1)->IsPickerCtrlGrowable(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_SetPickerCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool arg2 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grow", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PickerBase_SetPickerCtrlGrowable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_SetPickerCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PickerBase_SetPickerCtrlGrowable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPickerCtrlGrowable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_PickerBase_HasTextCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPickerBase *arg1 = (wxPickerBase *) 0 ; @@ -43364,6 +43643,88 @@ fail: } +SWIGINTERN PyObject *_wrap_FilePickerCtrl_CheckPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxFilePickerCtrl *arg1 = (wxFilePickerCtrl *) 0 ; + wxString *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "path", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FilePickerCtrl_CheckPath",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFilePickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FilePickerCtrl_CheckPath" "', expected argument " "1"" of type '" "wxFilePickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxFilePickerCtrl * >(argp1); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxFilePickerCtrl const *)arg1)->CheckPath((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_FilePickerCtrl_GetTextCtrlValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxFilePickerCtrl *arg1 = (wxFilePickerCtrl *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFilePickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FilePickerCtrl_GetTextCtrlValue" "', expected argument " "1"" of type '" "wxFilePickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxFilePickerCtrl * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxFilePickerCtrl const *)arg1)->GetTextCtrlValue(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *FilePickerCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -43773,6 +44134,88 @@ fail: } +SWIGINTERN PyObject *_wrap_DirPickerCtrl_CheckPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDirPickerCtrl *arg1 = (wxDirPickerCtrl *) 0 ; + wxString *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "path", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DirPickerCtrl_CheckPath",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDirPickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirPickerCtrl_CheckPath" "', expected argument " "1"" of type '" "wxDirPickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxDirPickerCtrl * >(argp1); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxDirPickerCtrl const *)arg1)->CheckPath((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_DirPickerCtrl_GetTextCtrlValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxDirPickerCtrl *arg1 = (wxDirPickerCtrl *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDirPickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirPickerCtrl_GetTextCtrlValue" "', expected argument " "1"" of type '" "wxDirPickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxDirPickerCtrl * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxDirPickerCtrl const *)arg1)->GetTextCtrlValue(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *DirPickerCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -44718,6 +45161,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TextCtrl_SaveFile", (PyCFunction) _wrap_TextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_MarkDirty", (PyCFunction)_wrap_TextCtrl_MarkDirty, METH_O, NULL}, { (char *)"TextCtrl_DiscardEdits", (PyCFunction)_wrap_TextCtrl_DiscardEdits, METH_O, NULL}, + { (char *)"TextCtrl_SetModified", (PyCFunction) _wrap_TextCtrl_SetModified, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_SetMaxLength", (PyCFunction) _wrap_TextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_WriteText", (PyCFunction) _wrap_TextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_AppendText", (PyCFunction) _wrap_TextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45248,7 +45692,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeItemData_Destroy", (PyCFunction)_wrap_TreeItemData_Destroy, METH_O, NULL}, { (char *)"TreeItemData_swigregister", TreeItemData_swigregister, METH_VARARGS, NULL}, { (char *)"TreeItemData_swiginit", TreeItemData_swiginit, METH_VARARGS, NULL}, - { (char *)"new_TreeEvent", (PyCFunction) _wrap_new_TreeEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_TreeEvent", _wrap_new_TreeEvent, METH_VARARGS, NULL}, { (char *)"TreeEvent_GetItem", (PyCFunction)_wrap_TreeEvent_GetItem, METH_O, NULL}, { (char *)"TreeEvent_SetItem", (PyCFunction) _wrap_TreeEvent_SetItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeEvent_GetOldItem", (PyCFunction)_wrap_TreeEvent_GetOldItem, METH_O, NULL}, @@ -45481,6 +45925,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"PickerBase_GetInternalMargin", (PyCFunction)_wrap_PickerBase_GetInternalMargin, METH_O, NULL}, { (char *)"PickerBase_SetTextCtrlProportion", (PyCFunction) _wrap_PickerBase_SetTextCtrlProportion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PickerBase_GetTextCtrlProportion", (PyCFunction)_wrap_PickerBase_GetTextCtrlProportion, METH_O, NULL}, + { (char *)"PickerBase_IsTextCtrlGrowable", (PyCFunction)_wrap_PickerBase_IsTextCtrlGrowable, METH_O, NULL}, + { (char *)"PickerBase_SetTextCtrlGrowable", (PyCFunction) _wrap_PickerBase_SetTextCtrlGrowable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PickerBase_IsPickerCtrlGrowable", (PyCFunction)_wrap_PickerBase_IsPickerCtrlGrowable, METH_O, NULL}, + { (char *)"PickerBase_SetPickerCtrlGrowable", (PyCFunction) _wrap_PickerBase_SetPickerCtrlGrowable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PickerBase_HasTextCtrl", (PyCFunction)_wrap_PickerBase_HasTextCtrl, METH_O, NULL}, { (char *)"PickerBase_GetTextCtrl", (PyCFunction)_wrap_PickerBase_GetTextCtrl, METH_O, NULL}, { (char *)"PickerBase_GetPickerCtrl", (PyCFunction)_wrap_PickerBase_GetPickerCtrl, METH_O, NULL}, @@ -45502,6 +45950,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"FilePickerCtrl_Create", (PyCFunction) _wrap_FilePickerCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FilePickerCtrl_GetPath", (PyCFunction)_wrap_FilePickerCtrl_GetPath, METH_O, NULL}, { (char *)"FilePickerCtrl_SetPath", (PyCFunction) _wrap_FilePickerCtrl_SetPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FilePickerCtrl_CheckPath", (PyCFunction) _wrap_FilePickerCtrl_CheckPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FilePickerCtrl_GetTextCtrlValue", (PyCFunction)_wrap_FilePickerCtrl_GetTextCtrlValue, METH_O, NULL}, { (char *)"FilePickerCtrl_swigregister", FilePickerCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"FilePickerCtrl_swiginit", FilePickerCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_DirPickerCtrl", (PyCFunction) _wrap_new_DirPickerCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45509,6 +45959,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"DirPickerCtrl_Create", (PyCFunction) _wrap_DirPickerCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DirPickerCtrl_GetPath", (PyCFunction)_wrap_DirPickerCtrl_GetPath, METH_O, NULL}, { (char *)"DirPickerCtrl_SetPath", (PyCFunction) _wrap_DirPickerCtrl_SetPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DirPickerCtrl_CheckPath", (PyCFunction) _wrap_DirPickerCtrl_CheckPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DirPickerCtrl_GetTextCtrlValue", (PyCFunction)_wrap_DirPickerCtrl_GetTextCtrlValue, METH_O, NULL}, { (char *)"DirPickerCtrl_swigregister", DirPickerCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"DirPickerCtrl_swiginit", DirPickerCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_FileDirPickerEvent", (PyCFunction) _wrap_new_FileDirPickerEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -48050,6 +48502,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "NB_HITTEST_ONICON",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONICON))); SWIG_Python_SetConstant(d, "NB_HITTEST_ONLABEL",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONLABEL))); SWIG_Python_SetConstant(d, "NB_HITTEST_ONITEM",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONITEM))); + SWIG_Python_SetConstant(d, "NB_HITTEST_ONPAGE",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONPAGE))); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); SWIG_Python_SetConstant(d, "LB_DEFAULT",SWIG_From_int(static_cast< int >(wxLB_DEFAULT))); @@ -48238,6 +48691,7 @@ SWIGEXPORT void SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK", PyInt_FromLong(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP", PyInt_FromLong(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_ITEM_MENU", PyInt_FromLong(wxEVT_COMMAND_TREE_ITEM_MENU)); + SWIG_addvarlink(SWIG_globals(),(char*)"NullTreeItemId",NullTreeItemId_get, NullTreeItemId_set); // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData"); diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 4f2165ed71..d9b7415366 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -1982,6 +1982,10 @@ class ImageHandler(Object): """CanRead(self, String name) -> bool""" return _core_.ImageHandler_CanRead(*args, **kwargs) + def CanReadStream(*args, **kwargs): + """CanReadStream(self, InputStream stream) -> bool""" + return _core_.ImageHandler_CanReadStream(*args, **kwargs) + def SetName(*args, **kwargs): """SetName(self, String name)""" return _core_.ImageHandler_SetName(*args, **kwargs) diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 73f818f3ee..f8bf8a2491 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -11861,6 +11861,62 @@ fail: } +SWIGINTERN PyObject *_wrap_ImageHandler_CanReadStream(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxImageHandler *arg1 = (wxImageHandler *) 0 ; + wxInputStream *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + wxPyInputStream *temp2 ; + bool created2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "stream", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_CanReadStream",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageHandler, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageHandler_CanReadStream" "', expected argument " "1"" of type '" "wxImageHandler *""'"); + } + arg1 = reinterpret_cast< wxImageHandler * >(argp1); + { + if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { + arg2 = temp2->m_wxis; + created2 = false; + } else { + PyErr_Clear(); // clear the failure of the wxPyConvert above + arg2 = wxPyCBInputStream_create(obj1, false); + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); + SWIG_fail; + } + created2 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->CanRead(*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (created2) delete arg2; + } + return resultobj; +fail: + { + if (created2) delete arg2; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_ImageHandler_SetName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxImageHandler *arg1 = (wxImageHandler *) 0 ; @@ -52893,6 +52949,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ImageHandler_GetType", (PyCFunction)_wrap_ImageHandler_GetType, METH_O, NULL}, { (char *)"ImageHandler_GetMimeType", (PyCFunction)_wrap_ImageHandler_GetMimeType, METH_O, NULL}, { (char *)"ImageHandler_CanRead", (PyCFunction) _wrap_ImageHandler_CanRead, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ImageHandler_CanReadStream", (PyCFunction) _wrap_ImageHandler_CanReadStream, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetName", (PyCFunction) _wrap_ImageHandler_SetName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetExtension", (PyCFunction) _wrap_ImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetType", (PyCFunction) _wrap_ImageHandler_SetType, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index c3732160db..5a74e15036 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -328,6 +328,41 @@ def Shell(*args, **kwargs): def StartTimer(*args): """StartTimer()""" return _misc_.StartTimer(*args) +UNKNOWN_PLATFORM = _misc_.UNKNOWN_PLATFORM +CURSES = _misc_.CURSES +XVIEW_X = _misc_.XVIEW_X +MOTIF_X = _misc_.MOTIF_X +COSE_X = _misc_.COSE_X +NEXTSTEP = _misc_.NEXTSTEP +MAC = _misc_.MAC +MAC_DARWIN = _misc_.MAC_DARWIN +BEOS = _misc_.BEOS +GTK = _misc_.GTK +GTK_WIN32 = _misc_.GTK_WIN32 +GTK_OS2 = _misc_.GTK_OS2 +GTK_BEOS = _misc_.GTK_BEOS +GEOS = _misc_.GEOS +OS2_PM = _misc_.OS2_PM +WINDOWS = _misc_.WINDOWS +MICROWINDOWS = _misc_.MICROWINDOWS +PENWINDOWS = _misc_.PENWINDOWS +WINDOWS_NT = _misc_.WINDOWS_NT +WIN32S = _misc_.WIN32S +WIN95 = _misc_.WIN95 +WIN386 = _misc_.WIN386 +WINDOWS_CE = _misc_.WINDOWS_CE +WINDOWS_POCKETPC = _misc_.WINDOWS_POCKETPC +WINDOWS_SMARTPHONE = _misc_.WINDOWS_SMARTPHONE +MGL_UNIX = _misc_.MGL_UNIX +MGL_X = _misc_.MGL_X +MGL_WIN32 = _misc_.MGL_WIN32 +MGL_OS2 = _misc_.MGL_OS2 +MGL_DOS = _misc_.MGL_DOS +WINDOWS_OS2 = _misc_.WINDOWS_OS2 +UNIX = _misc_.UNIX +X11 = _misc_.X11 +PALMOS = _misc_.PALMOS +DOS = _misc_.DOS def GetOsVersion(*args): """GetOsVersion() -> (platform, major, minor)""" diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index 5ec75d1464..f9ce665baf 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -38887,6 +38887,41 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorPromptStr",FileSelectorPromptStr_get, FileSelectorPromptStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"DirSelectorPromptStr",DirSelectorPromptStr_get, DirSelectorPromptStr_set); + SWIG_Python_SetConstant(d, "UNKNOWN_PLATFORM",SWIG_From_int(static_cast< int >(wxUNKNOWN_PLATFORM))); + SWIG_Python_SetConstant(d, "CURSES",SWIG_From_int(static_cast< int >(wxCURSES))); + SWIG_Python_SetConstant(d, "XVIEW_X",SWIG_From_int(static_cast< int >(wxXVIEW_X))); + SWIG_Python_SetConstant(d, "MOTIF_X",SWIG_From_int(static_cast< int >(wxMOTIF_X))); + SWIG_Python_SetConstant(d, "COSE_X",SWIG_From_int(static_cast< int >(wxCOSE_X))); + SWIG_Python_SetConstant(d, "NEXTSTEP",SWIG_From_int(static_cast< int >(wxNEXTSTEP))); + SWIG_Python_SetConstant(d, "MAC",SWIG_From_int(static_cast< int >(wxMAC))); + SWIG_Python_SetConstant(d, "MAC_DARWIN",SWIG_From_int(static_cast< int >(wxMAC_DARWIN))); + SWIG_Python_SetConstant(d, "BEOS",SWIG_From_int(static_cast< int >(wxBEOS))); + SWIG_Python_SetConstant(d, "GTK",SWIG_From_int(static_cast< int >(wxGTK))); + SWIG_Python_SetConstant(d, "GTK_WIN32",SWIG_From_int(static_cast< int >(wxGTK_WIN32))); + SWIG_Python_SetConstant(d, "GTK_OS2",SWIG_From_int(static_cast< int >(wxGTK_OS2))); + SWIG_Python_SetConstant(d, "GTK_BEOS",SWIG_From_int(static_cast< int >(wxGTK_BEOS))); + SWIG_Python_SetConstant(d, "GEOS",SWIG_From_int(static_cast< int >(wxGEOS))); + SWIG_Python_SetConstant(d, "OS2_PM",SWIG_From_int(static_cast< int >(wxOS2_PM))); + SWIG_Python_SetConstant(d, "WINDOWS",SWIG_From_int(static_cast< int >(wxWINDOWS))); + SWIG_Python_SetConstant(d, "MICROWINDOWS",SWIG_From_int(static_cast< int >(wxMICROWINDOWS))); + SWIG_Python_SetConstant(d, "PENWINDOWS",SWIG_From_int(static_cast< int >(wxPENWINDOWS))); + SWIG_Python_SetConstant(d, "WINDOWS_NT",SWIG_From_int(static_cast< int >(wxWINDOWS_NT))); + SWIG_Python_SetConstant(d, "WIN32S",SWIG_From_int(static_cast< int >(wxWIN32S))); + SWIG_Python_SetConstant(d, "WIN95",SWIG_From_int(static_cast< int >(wxWIN95))); + SWIG_Python_SetConstant(d, "WIN386",SWIG_From_int(static_cast< int >(wxWIN386))); + SWIG_Python_SetConstant(d, "WINDOWS_CE",SWIG_From_int(static_cast< int >(wxWINDOWS_CE))); + SWIG_Python_SetConstant(d, "WINDOWS_POCKETPC",SWIG_From_int(static_cast< int >(wxWINDOWS_POCKETPC))); + SWIG_Python_SetConstant(d, "WINDOWS_SMARTPHONE",SWIG_From_int(static_cast< int >(wxWINDOWS_SMARTPHONE))); + SWIG_Python_SetConstant(d, "MGL_UNIX",SWIG_From_int(static_cast< int >(wxMGL_UNIX))); + SWIG_Python_SetConstant(d, "MGL_X",SWIG_From_int(static_cast< int >(wxMGL_X))); + SWIG_Python_SetConstant(d, "MGL_WIN32",SWIG_From_int(static_cast< int >(wxMGL_WIN32))); + SWIG_Python_SetConstant(d, "MGL_OS2",SWIG_From_int(static_cast< int >(wxMGL_OS2))); + SWIG_Python_SetConstant(d, "MGL_DOS",SWIG_From_int(static_cast< int >(wxMGL_DOS))); + SWIG_Python_SetConstant(d, "WINDOWS_OS2",SWIG_From_int(static_cast< int >(wxWINDOWS_OS2))); + SWIG_Python_SetConstant(d, "UNIX",SWIG_From_int(static_cast< int >(wxUNIX))); + SWIG_Python_SetConstant(d, "X11",SWIG_From_int(static_cast< int >(wxX11))); + SWIG_Python_SetConstant(d, "PALMOS",SWIG_From_int(static_cast< int >(wxPALMOS))); + SWIG_Python_SetConstant(d, "DOS",SWIG_From_int(static_cast< int >(wxDOS))); SWIG_Python_SetConstant(d, "SHUTDOWN_POWEROFF",SWIG_From_int(static_cast< int >(wxSHUTDOWN_POWEROFF))); SWIG_Python_SetConstant(d, "SHUTDOWN_REBOOT",SWIG_From_int(static_cast< int >(wxSHUTDOWN_REBOOT))); SWIG_Python_SetConstant(d, "TIMER_CONTINUOUS",SWIG_From_int(static_cast< int >(wxTIMER_CONTINUOUS))); diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index e5d48a1f62..6247ad070f 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -2181,6 +2181,7 @@ OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST MULTIPLE = _windows_.MULTIPLE CHANGE_DIR = _windows_.CHANGE_DIR +HIDE_READONLY = _windows_.HIDE_READONLY FD_OPEN = _windows_.FD_OPEN FD_SAVE = _windows_.FD_SAVE FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index bb40e22258..44221ce82a 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -3223,6 +3223,10 @@ SWIGINTERN void wxPyTaskBarIcon_Destroy(wxPyTaskBarIcon *self){ static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyGetTextFromUserPromptStr(wxGetTextFromUserPromptStr); static const wxString wxPyMessageBoxCaptionStr(wxMessageBoxCaptionStr); + +// for compatibility only +#define wxHIDE_READONLY 0 + SWIGINTERN PyObject *wxFileDialog_GetFilenames(wxFileDialog *self){ wxArrayString arr; self->GetFilenames(arr); @@ -33469,6 +33473,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST))); SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE))); SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR))); + SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY))); SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN))); SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE))); SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT))); diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 2911f7f0af..5d7585636f 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -1751,6 +1751,10 @@ class TextCtrl(_core.Control): """DiscardEdits(self)""" return _controls_.TextCtrl_DiscardEdits(*args, **kwargs) + def SetModified(*args, **kwargs): + """SetModified(self, bool modified)""" + return _controls_.TextCtrl_SetModified(*args, **kwargs) + def SetMaxLength(*args, **kwargs): """SetMaxLength(self, unsigned long len)""" return _controls_.TextCtrl_SetMaxLength(*args, **kwargs) @@ -2978,6 +2982,7 @@ NB_HITTEST_NOWHERE = _controls_.NB_HITTEST_NOWHERE NB_HITTEST_ONICON = _controls_.NB_HITTEST_ONICON NB_HITTEST_ONLABEL = _controls_.NB_HITTEST_ONLABEL NB_HITTEST_ONITEM = _controls_.NB_HITTEST_ONITEM +NB_HITTEST_ONPAGE = _controls_.NB_HITTEST_ONPAGE class Notebook(BookCtrlBase): """Proxy of C++ Notebook class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -4905,9 +4910,12 @@ class TreeEvent(_core.NotifyEvent): """Proxy of C++ TreeEvent class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent""" - _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args, **kwargs)) + def __init__(self, *args): + """ + __init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent + __init__(self, EventType commandType, TreeCtrl tree, TreeItemId item=NullTreeItemId) -> TreeEvent + """ + _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args)) def GetItem(*args, **kwargs): """GetItem(self) -> TreeItemId""" return _controls_.TreeEvent_GetItem(*args, **kwargs) @@ -6408,6 +6416,22 @@ class PickerBase(_core.Control): """ return _controls_.PickerBase_GetTextCtrlProportion(*args, **kwargs) + def IsTextCtrlGrowable(*args, **kwargs): + """IsTextCtrlGrowable(self) -> bool""" + return _controls_.PickerBase_IsTextCtrlGrowable(*args, **kwargs) + + def SetTextCtrlGrowable(*args, **kwargs): + """SetTextCtrlGrowable(self, bool grow=True)""" + return _controls_.PickerBase_SetTextCtrlGrowable(*args, **kwargs) + + def IsPickerCtrlGrowable(*args, **kwargs): + """IsPickerCtrlGrowable(self) -> bool""" + return _controls_.PickerBase_IsPickerCtrlGrowable(*args, **kwargs) + + def SetPickerCtrlGrowable(*args, **kwargs): + """SetPickerCtrlGrowable(self, bool grow=True)""" + return _controls_.PickerBase_SetPickerCtrlGrowable(*args, **kwargs) + def HasTextCtrl(*args, **kwargs): """ HasTextCtrl(self) -> bool @@ -6578,6 +6602,14 @@ class FilePickerCtrl(PickerBase): """SetPath(self, String str)""" return _controls_.FilePickerCtrl_SetPath(*args, **kwargs) + def CheckPath(*args, **kwargs): + """CheckPath(self, String path) -> bool""" + return _controls_.FilePickerCtrl_CheckPath(*args, **kwargs) + + def GetTextCtrlValue(*args, **kwargs): + """GetTextCtrlValue(self) -> String""" + return _controls_.FilePickerCtrl_GetTextCtrlValue(*args, **kwargs) + _controls_.FilePickerCtrl_swigregister(FilePickerCtrl) FilePickerCtrlNameStr = cvar.FilePickerCtrlNameStr FileSelectorPromptStr = cvar.FileSelectorPromptStr @@ -6623,6 +6655,14 @@ class DirPickerCtrl(PickerBase): """SetPath(self, String str)""" return _controls_.DirPickerCtrl_SetPath(*args, **kwargs) + def CheckPath(*args, **kwargs): + """CheckPath(self, String path) -> bool""" + return _controls_.DirPickerCtrl_CheckPath(*args, **kwargs) + + def GetTextCtrlValue(*args, **kwargs): + """GetTextCtrlValue(self) -> String""" + return _controls_.DirPickerCtrl_GetTextCtrlValue(*args, **kwargs) + _controls_.DirPickerCtrl_swigregister(DirPickerCtrl) def PreDirPickerCtrl(*args, **kwargs): diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 618efb7691..8f2237b66b 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -3116,6 +3116,9 @@ SWIGINTERN wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){ SWIGINTERN bool wxTreeItemId___eq__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self == *other) : false; } SWIGINTERN bool wxTreeItemId___ne__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self != *other) : true; } SWIGINTERN void wxPyTreeItemData_Destroy(wxPyTreeItemData *self){ delete self; } + + static wxTreeItemId wxNullTreeItemId; + // C++ version of Python aware wxTreeCtrl class wxPyTreeCtrl : public wxTreeCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl) @@ -3358,12 +3361,6 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){ return rv; } static const wxString wxPyHyperlinkCtrlNameStr(wxHyperlinkCtrlNameStr); - -#include -#include -#include -#include - static const wxString wxPyColourPickerCtrlNameStr(wxColourPickerCtrlNameStr); static const wxString wxPyFilePickerCtrlNameStr(wxFilePickerCtrlNameStr); static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); @@ -12593,6 +12590,44 @@ fail: } +SWIGINTERN PyObject *_wrap_TextCtrl_SetModified(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "modified", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetModified",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TextCtrl_SetModified" "', expected argument " "1"" of type '" "wxTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TextCtrl_SetModified" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetModified(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; @@ -32891,7 +32926,37 @@ SWIGINTERN PyObject *TreeItemData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN int NullTreeItemId_set(PyObject *_val) { + { + void *argp = 0; + int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""wxNullTreeItemId""' of type '""wxTreeItemId""'"); + } + if (!argp) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""wxNullTreeItemId""' of type '""wxTreeItemId""'"); + } else { + wxTreeItemId * temp; + temp = reinterpret_cast< wxTreeItemId * >(argp); + wxNullTreeItemId = *temp; + if (SWIG_IsNewObj(res)) delete temp; + } + } + return 0; +fail: + return 1; +} + + +SWIGINTERN PyObject *NullTreeItemId_get(void) { + PyObject *pyobj = 0; + + pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(&wxNullTreeItemId), SWIGTYPE_p_wxTreeItemId, 0 ); + return pyobj; +} + + +SWIGINTERN PyObject *_wrap_new_TreeEvent__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; @@ -32900,22 +32965,17 @@ SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *SWIGUNUSEDPARM(self), PyObjec int ecode1 = 0 ; int val2 ; int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "commandType",(char *) "id", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TreeEvent",kwnames,&obj0,&obj1)) SWIG_fail; - if (obj0) { - ecode1 = SWIG_AsVal_int(obj0, &val1); + if ((nobjs < 0) || (nobjs > 2)) SWIG_fail; + if (swig_obj[0]) { + ecode1 = SWIG_AsVal_int(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TreeEvent" "', expected argument " "1"" of type '" "wxEventType""'"); } arg1 = static_cast< wxEventType >(val1); } - if (obj1) { - ecode2 = SWIG_AsVal_int(obj1, &val2); + if (swig_obj[1]) { + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_TreeEvent" "', expected argument " "2"" of type '" "int""'"); } @@ -32934,6 +32994,85 @@ fail: } +SWIGINTERN PyObject *_wrap_new_TreeEvent__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxEventType arg1 ; + wxPyTreeCtrl *arg2 = (wxPyTreeCtrl *) 0 ; + wxTreeItemId &arg3_defvalue = wxNullTreeItemId ; + wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; + wxTreeEvent *result = 0 ; + int val1 ; + int ecode1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + + if ((nobjs < 2) || (nobjs > 3)) SWIG_fail; + ecode1 = SWIG_AsVal_int(swig_obj[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TreeEvent" "', expected argument " "1"" of type '" "wxEventType""'"); + } + arg1 = static_cast< wxEventType >(val1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxPyTreeCtrl, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_TreeEvent" "', expected argument " "2"" of type '" "wxPyTreeCtrl *""'"); + } + arg2 = reinterpret_cast< wxPyTreeCtrl * >(argp2); + if (swig_obj[2]) { + res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_wxTreeItemId, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_TreeEvent" "', expected argument " "3"" of type '" "wxTreeItemId &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_TreeEvent" "', expected argument " "3"" of type '" "wxTreeItemId &""'"); + } + arg3 = reinterpret_cast< wxTreeItemId * >(argp3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreeEvent *)new wxTreeEvent(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeEvent, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_TreeEvent",0,3,argv))) SWIG_fail; + --argc; + if ((argc >= 0) && (argc <= 2)) { + int _v = 0; + if (argc > 1) { + { + { + int res = SWIG_AsVal_int(argv[1], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + } + return _wrap_new_TreeEvent__SWIG_0(self, argc, argv); + } +check_1: + + if ((argc >= 2) && (argc <= 3)) { + return _wrap_new_TreeEvent__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_TreeEvent'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeEvent_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeEvent *arg1 = (wxTreeEvent *) 0 ; @@ -42541,6 +42680,146 @@ fail: } +SWIGINTERN PyObject *_wrap_PickerBase_IsTextCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_IsTextCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase const *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPickerBase const *)arg1)->IsTextCtrlGrowable(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_SetTextCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool arg2 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grow", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PickerBase_SetTextCtrlGrowable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_SetTextCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PickerBase_SetTextCtrlGrowable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetTextCtrlGrowable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_IsPickerCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_IsPickerCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase const *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPickerBase const *)arg1)->IsPickerCtrlGrowable(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_PickerBase_SetPickerCtrlGrowable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPickerBase *arg1 = (wxPickerBase *) 0 ; + bool arg2 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grow", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PickerBase_SetPickerCtrlGrowable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPickerBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PickerBase_SetPickerCtrlGrowable" "', expected argument " "1"" of type '" "wxPickerBase *""'"); + } + arg1 = reinterpret_cast< wxPickerBase * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PickerBase_SetPickerCtrlGrowable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPickerCtrlGrowable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_PickerBase_HasTextCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPickerBase *arg1 = (wxPickerBase *) 0 ; @@ -43651,6 +43930,88 @@ fail: } +SWIGINTERN PyObject *_wrap_FilePickerCtrl_CheckPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxFilePickerCtrl *arg1 = (wxFilePickerCtrl *) 0 ; + wxString *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "path", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FilePickerCtrl_CheckPath",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFilePickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FilePickerCtrl_CheckPath" "', expected argument " "1"" of type '" "wxFilePickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxFilePickerCtrl * >(argp1); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxFilePickerCtrl const *)arg1)->CheckPath((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_FilePickerCtrl_GetTextCtrlValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxFilePickerCtrl *arg1 = (wxFilePickerCtrl *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFilePickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FilePickerCtrl_GetTextCtrlValue" "', expected argument " "1"" of type '" "wxFilePickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxFilePickerCtrl * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxFilePickerCtrl const *)arg1)->GetTextCtrlValue(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *FilePickerCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -44060,6 +44421,88 @@ fail: } +SWIGINTERN PyObject *_wrap_DirPickerCtrl_CheckPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDirPickerCtrl *arg1 = (wxDirPickerCtrl *) 0 ; + wxString *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "path", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DirPickerCtrl_CheckPath",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDirPickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirPickerCtrl_CheckPath" "', expected argument " "1"" of type '" "wxDirPickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxDirPickerCtrl * >(argp1); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxDirPickerCtrl const *)arg1)->CheckPath((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_DirPickerCtrl_GetTextCtrlValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxDirPickerCtrl *arg1 = (wxDirPickerCtrl *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDirPickerCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DirPickerCtrl_GetTextCtrlValue" "', expected argument " "1"" of type '" "wxDirPickerCtrl const *""'"); + } + arg1 = reinterpret_cast< wxDirPickerCtrl * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxDirPickerCtrl const *)arg1)->GetTextCtrlValue(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *DirPickerCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -45007,6 +45450,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TextCtrl_SaveFile", (PyCFunction) _wrap_TextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_MarkDirty", (PyCFunction)_wrap_TextCtrl_MarkDirty, METH_O, NULL}, { (char *)"TextCtrl_DiscardEdits", (PyCFunction)_wrap_TextCtrl_DiscardEdits, METH_O, NULL}, + { (char *)"TextCtrl_SetModified", (PyCFunction) _wrap_TextCtrl_SetModified, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_SetMaxLength", (PyCFunction) _wrap_TextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_WriteText", (PyCFunction) _wrap_TextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextCtrl_AppendText", (PyCFunction) _wrap_TextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45539,7 +45983,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeItemData_Destroy", (PyCFunction)_wrap_TreeItemData_Destroy, METH_O, NULL}, { (char *)"TreeItemData_swigregister", TreeItemData_swigregister, METH_VARARGS, NULL}, { (char *)"TreeItemData_swiginit", TreeItemData_swiginit, METH_VARARGS, NULL}, - { (char *)"new_TreeEvent", (PyCFunction) _wrap_new_TreeEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_TreeEvent", _wrap_new_TreeEvent, METH_VARARGS, NULL}, { (char *)"TreeEvent_GetItem", (PyCFunction)_wrap_TreeEvent_GetItem, METH_O, NULL}, { (char *)"TreeEvent_SetItem", (PyCFunction) _wrap_TreeEvent_SetItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeEvent_GetOldItem", (PyCFunction)_wrap_TreeEvent_GetOldItem, METH_O, NULL}, @@ -45775,6 +46219,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"PickerBase_GetInternalMargin", (PyCFunction)_wrap_PickerBase_GetInternalMargin, METH_O, NULL}, { (char *)"PickerBase_SetTextCtrlProportion", (PyCFunction) _wrap_PickerBase_SetTextCtrlProportion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PickerBase_GetTextCtrlProportion", (PyCFunction)_wrap_PickerBase_GetTextCtrlProportion, METH_O, NULL}, + { (char *)"PickerBase_IsTextCtrlGrowable", (PyCFunction)_wrap_PickerBase_IsTextCtrlGrowable, METH_O, NULL}, + { (char *)"PickerBase_SetTextCtrlGrowable", (PyCFunction) _wrap_PickerBase_SetTextCtrlGrowable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PickerBase_IsPickerCtrlGrowable", (PyCFunction)_wrap_PickerBase_IsPickerCtrlGrowable, METH_O, NULL}, + { (char *)"PickerBase_SetPickerCtrlGrowable", (PyCFunction) _wrap_PickerBase_SetPickerCtrlGrowable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PickerBase_HasTextCtrl", (PyCFunction)_wrap_PickerBase_HasTextCtrl, METH_O, NULL}, { (char *)"PickerBase_GetTextCtrl", (PyCFunction)_wrap_PickerBase_GetTextCtrl, METH_O, NULL}, { (char *)"PickerBase_GetPickerCtrl", (PyCFunction)_wrap_PickerBase_GetPickerCtrl, METH_O, NULL}, @@ -45796,6 +46244,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"FilePickerCtrl_Create", (PyCFunction) _wrap_FilePickerCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FilePickerCtrl_GetPath", (PyCFunction)_wrap_FilePickerCtrl_GetPath, METH_O, NULL}, { (char *)"FilePickerCtrl_SetPath", (PyCFunction) _wrap_FilePickerCtrl_SetPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FilePickerCtrl_CheckPath", (PyCFunction) _wrap_FilePickerCtrl_CheckPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FilePickerCtrl_GetTextCtrlValue", (PyCFunction)_wrap_FilePickerCtrl_GetTextCtrlValue, METH_O, NULL}, { (char *)"FilePickerCtrl_swigregister", FilePickerCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"FilePickerCtrl_swiginit", FilePickerCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_DirPickerCtrl", (PyCFunction) _wrap_new_DirPickerCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45803,6 +46253,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"DirPickerCtrl_Create", (PyCFunction) _wrap_DirPickerCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DirPickerCtrl_GetPath", (PyCFunction)_wrap_DirPickerCtrl_GetPath, METH_O, NULL}, { (char *)"DirPickerCtrl_SetPath", (PyCFunction) _wrap_DirPickerCtrl_SetPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DirPickerCtrl_CheckPath", (PyCFunction) _wrap_DirPickerCtrl_CheckPath, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DirPickerCtrl_GetTextCtrlValue", (PyCFunction)_wrap_DirPickerCtrl_GetTextCtrlValue, METH_O, NULL}, { (char *)"DirPickerCtrl_swigregister", DirPickerCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"DirPickerCtrl_swiginit", DirPickerCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_FileDirPickerEvent", (PyCFunction) _wrap_new_FileDirPickerEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -48350,6 +48802,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "NB_HITTEST_ONICON",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONICON))); SWIG_Python_SetConstant(d, "NB_HITTEST_ONLABEL",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONLABEL))); SWIG_Python_SetConstant(d, "NB_HITTEST_ONITEM",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONITEM))); + SWIG_Python_SetConstant(d, "NB_HITTEST_ONPAGE",SWIG_From_int(static_cast< int >(wxNB_HITTEST_ONPAGE))); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); SWIG_Python_SetConstant(d, "LB_DEFAULT",SWIG_From_int(static_cast< int >(wxLB_DEFAULT))); @@ -48538,6 +48991,7 @@ SWIGEXPORT void SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK", PyInt_FromLong(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP", PyInt_FromLong(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP)); PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_ITEM_MENU", PyInt_FromLong(wxEVT_COMMAND_TREE_ITEM_MENU)); + SWIG_addvarlink(SWIG_globals(),(char*)"NullTreeItemId",NullTreeItemId_get, NullTreeItemId_set); // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData"); diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 3f87c1c222..372fa1ee7d 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -1691,8 +1691,6 @@ class FSFile(Object): DateTime modif) -> FSFile """ _core_.FSFile_swiginit(self,_core_.new_FSFile(*args, **kwargs)) - self.thisown = 0 # It will normally be deleted by the user of the wx.FileSystem - __swig_destroy__ = _core_.delete_FSFile __del__ = lambda self : None; def GetStream(*args, **kwargs): @@ -1984,6 +1982,10 @@ class ImageHandler(Object): """CanRead(self, String name) -> bool""" return _core_.ImageHandler_CanRead(*args, **kwargs) + def CanReadStream(*args, **kwargs): + """CanReadStream(self, InputStream stream) -> bool""" + return _core_.ImageHandler_CanReadStream(*args, **kwargs) + def SetName(*args, **kwargs): """SetName(self, String name)""" return _core_.ImageHandler_SetName(*args, **kwargs) diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index ce6b257eaa..94eb2c004d 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -9642,9 +9642,7 @@ SWIGINTERN PyObject *_wrap_new_FSFile(PyObject *SWIGUNUSEDPARM(self), PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFSFile, SWIG_POINTER_NEW | 0 ); { if (temp2) delete arg2; @@ -10068,7 +10066,7 @@ SWIGINTERN PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *SWIGUNUSEDPARM(s if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_OWN); + resultobj = wxPyMake_wxObject(result, SWIG_POINTER_OWN); } { if (temp3) @@ -10622,7 +10620,7 @@ SWIGINTERN PyObject *_wrap_FileSystem_OpenFile(PyObject *SWIGUNUSEDPARM(self), P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_OWN); + resultobj = wxPyMake_wxObject(result, SWIG_POINTER_OWN); } { if (temp2) @@ -10986,7 +10984,7 @@ SWIGINTERN PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *SWIGUNUSEDPARM(s if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_OWN); + resultobj = wxPyMake_wxObject(result, SWIG_POINTER_OWN); } { if (temp3) @@ -11123,7 +11121,7 @@ SWIGINTERN PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *SWIGUNUSEDPARM(self), if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_OWN); + resultobj = wxPyMake_wxObject(result, SWIG_POINTER_OWN); } { if (temp3) @@ -11546,7 +11544,7 @@ SWIGINTERN PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *SWIGUNUSEDPARM(sel if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_OWN); + resultobj = wxPyMake_wxObject(result, SWIG_POINTER_OWN); } { if (temp3) @@ -11848,6 +11846,62 @@ fail: } +SWIGINTERN PyObject *_wrap_ImageHandler_CanReadStream(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxImageHandler *arg1 = (wxImageHandler *) 0 ; + wxInputStream *arg2 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + wxPyInputStream *temp2 ; + bool created2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "stream", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_CanReadStream",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageHandler, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageHandler_CanReadStream" "', expected argument " "1"" of type '" "wxImageHandler *""'"); + } + arg1 = reinterpret_cast< wxImageHandler * >(argp1); + { + if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) { + arg2 = temp2->m_wxis; + created2 = false; + } else { + PyErr_Clear(); // clear the failure of the wxPyConvert above + arg2 = wxPyCBInputStream_create(obj1, false); + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); + SWIG_fail; + } + created2 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->CanRead(*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (created2) delete arg2; + } + return resultobj; +fail: + { + if (created2) delete arg2; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_ImageHandler_SetName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxImageHandler *arg1 = (wxImageHandler *) 0 ; @@ -52921,6 +52975,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ImageHandler_GetType", (PyCFunction)_wrap_ImageHandler_GetType, METH_O, NULL}, { (char *)"ImageHandler_GetMimeType", (PyCFunction)_wrap_ImageHandler_GetMimeType, METH_O, NULL}, { (char *)"ImageHandler_CanRead", (PyCFunction) _wrap_ImageHandler_CanRead, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ImageHandler_CanReadStream", (PyCFunction) _wrap_ImageHandler_CanReadStream, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetName", (PyCFunction) _wrap_ImageHandler_SetName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetExtension", (PyCFunction) _wrap_ImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHandler_SetType", (PyCFunction) _wrap_ImageHandler_SetType, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index c3732160db..5a74e15036 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -328,6 +328,41 @@ def Shell(*args, **kwargs): def StartTimer(*args): """StartTimer()""" return _misc_.StartTimer(*args) +UNKNOWN_PLATFORM = _misc_.UNKNOWN_PLATFORM +CURSES = _misc_.CURSES +XVIEW_X = _misc_.XVIEW_X +MOTIF_X = _misc_.MOTIF_X +COSE_X = _misc_.COSE_X +NEXTSTEP = _misc_.NEXTSTEP +MAC = _misc_.MAC +MAC_DARWIN = _misc_.MAC_DARWIN +BEOS = _misc_.BEOS +GTK = _misc_.GTK +GTK_WIN32 = _misc_.GTK_WIN32 +GTK_OS2 = _misc_.GTK_OS2 +GTK_BEOS = _misc_.GTK_BEOS +GEOS = _misc_.GEOS +OS2_PM = _misc_.OS2_PM +WINDOWS = _misc_.WINDOWS +MICROWINDOWS = _misc_.MICROWINDOWS +PENWINDOWS = _misc_.PENWINDOWS +WINDOWS_NT = _misc_.WINDOWS_NT +WIN32S = _misc_.WIN32S +WIN95 = _misc_.WIN95 +WIN386 = _misc_.WIN386 +WINDOWS_CE = _misc_.WINDOWS_CE +WINDOWS_POCKETPC = _misc_.WINDOWS_POCKETPC +WINDOWS_SMARTPHONE = _misc_.WINDOWS_SMARTPHONE +MGL_UNIX = _misc_.MGL_UNIX +MGL_X = _misc_.MGL_X +MGL_WIN32 = _misc_.MGL_WIN32 +MGL_OS2 = _misc_.MGL_OS2 +MGL_DOS = _misc_.MGL_DOS +WINDOWS_OS2 = _misc_.WINDOWS_OS2 +UNIX = _misc_.UNIX +X11 = _misc_.X11 +PALMOS = _misc_.PALMOS +DOS = _misc_.DOS def GetOsVersion(*args): """GetOsVersion() -> (platform, major, minor)""" diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index 8127c1e111..eac81c4245 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -38887,6 +38887,41 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorPromptStr",FileSelectorPromptStr_get, FileSelectorPromptStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"DirSelectorPromptStr",DirSelectorPromptStr_get, DirSelectorPromptStr_set); + SWIG_Python_SetConstant(d, "UNKNOWN_PLATFORM",SWIG_From_int(static_cast< int >(wxUNKNOWN_PLATFORM))); + SWIG_Python_SetConstant(d, "CURSES",SWIG_From_int(static_cast< int >(wxCURSES))); + SWIG_Python_SetConstant(d, "XVIEW_X",SWIG_From_int(static_cast< int >(wxXVIEW_X))); + SWIG_Python_SetConstant(d, "MOTIF_X",SWIG_From_int(static_cast< int >(wxMOTIF_X))); + SWIG_Python_SetConstant(d, "COSE_X",SWIG_From_int(static_cast< int >(wxCOSE_X))); + SWIG_Python_SetConstant(d, "NEXTSTEP",SWIG_From_int(static_cast< int >(wxNEXTSTEP))); + SWIG_Python_SetConstant(d, "MAC",SWIG_From_int(static_cast< int >(wxMAC))); + SWIG_Python_SetConstant(d, "MAC_DARWIN",SWIG_From_int(static_cast< int >(wxMAC_DARWIN))); + SWIG_Python_SetConstant(d, "BEOS",SWIG_From_int(static_cast< int >(wxBEOS))); + SWIG_Python_SetConstant(d, "GTK",SWIG_From_int(static_cast< int >(wxGTK))); + SWIG_Python_SetConstant(d, "GTK_WIN32",SWIG_From_int(static_cast< int >(wxGTK_WIN32))); + SWIG_Python_SetConstant(d, "GTK_OS2",SWIG_From_int(static_cast< int >(wxGTK_OS2))); + SWIG_Python_SetConstant(d, "GTK_BEOS",SWIG_From_int(static_cast< int >(wxGTK_BEOS))); + SWIG_Python_SetConstant(d, "GEOS",SWIG_From_int(static_cast< int >(wxGEOS))); + SWIG_Python_SetConstant(d, "OS2_PM",SWIG_From_int(static_cast< int >(wxOS2_PM))); + SWIG_Python_SetConstant(d, "WINDOWS",SWIG_From_int(static_cast< int >(wxWINDOWS))); + SWIG_Python_SetConstant(d, "MICROWINDOWS",SWIG_From_int(static_cast< int >(wxMICROWINDOWS))); + SWIG_Python_SetConstant(d, "PENWINDOWS",SWIG_From_int(static_cast< int >(wxPENWINDOWS))); + SWIG_Python_SetConstant(d, "WINDOWS_NT",SWIG_From_int(static_cast< int >(wxWINDOWS_NT))); + SWIG_Python_SetConstant(d, "WIN32S",SWIG_From_int(static_cast< int >(wxWIN32S))); + SWIG_Python_SetConstant(d, "WIN95",SWIG_From_int(static_cast< int >(wxWIN95))); + SWIG_Python_SetConstant(d, "WIN386",SWIG_From_int(static_cast< int >(wxWIN386))); + SWIG_Python_SetConstant(d, "WINDOWS_CE",SWIG_From_int(static_cast< int >(wxWINDOWS_CE))); + SWIG_Python_SetConstant(d, "WINDOWS_POCKETPC",SWIG_From_int(static_cast< int >(wxWINDOWS_POCKETPC))); + SWIG_Python_SetConstant(d, "WINDOWS_SMARTPHONE",SWIG_From_int(static_cast< int >(wxWINDOWS_SMARTPHONE))); + SWIG_Python_SetConstant(d, "MGL_UNIX",SWIG_From_int(static_cast< int >(wxMGL_UNIX))); + SWIG_Python_SetConstant(d, "MGL_X",SWIG_From_int(static_cast< int >(wxMGL_X))); + SWIG_Python_SetConstant(d, "MGL_WIN32",SWIG_From_int(static_cast< int >(wxMGL_WIN32))); + SWIG_Python_SetConstant(d, "MGL_OS2",SWIG_From_int(static_cast< int >(wxMGL_OS2))); + SWIG_Python_SetConstant(d, "MGL_DOS",SWIG_From_int(static_cast< int >(wxMGL_DOS))); + SWIG_Python_SetConstant(d, "WINDOWS_OS2",SWIG_From_int(static_cast< int >(wxWINDOWS_OS2))); + SWIG_Python_SetConstant(d, "UNIX",SWIG_From_int(static_cast< int >(wxUNIX))); + SWIG_Python_SetConstant(d, "X11",SWIG_From_int(static_cast< int >(wxX11))); + SWIG_Python_SetConstant(d, "PALMOS",SWIG_From_int(static_cast< int >(wxPALMOS))); + SWIG_Python_SetConstant(d, "DOS",SWIG_From_int(static_cast< int >(wxDOS))); SWIG_Python_SetConstant(d, "SHUTDOWN_POWEROFF",SWIG_From_int(static_cast< int >(wxSHUTDOWN_POWEROFF))); SWIG_Python_SetConstant(d, "SHUTDOWN_REBOOT",SWIG_From_int(static_cast< int >(wxSHUTDOWN_REBOOT))); SWIG_Python_SetConstant(d, "TIMER_CONTINUOUS",SWIG_From_int(static_cast< int >(wxTIMER_CONTINUOUS))); diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index e53a80f8f4..254f013e23 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -2209,6 +2209,7 @@ OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST MULTIPLE = _windows_.MULTIPLE CHANGE_DIR = _windows_.CHANGE_DIR +HIDE_READONLY = _windows_.HIDE_READONLY FD_OPEN = _windows_.FD_OPEN FD_SAVE = _windows_.FD_SAVE FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index 3d44ad48dc..67b2bc9e46 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -3222,6 +3222,10 @@ SWIGINTERN void wxPyTaskBarIcon_Destroy(wxPyTaskBarIcon *self){ static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyGetTextFromUserPromptStr(wxGetTextFromUserPromptStr); static const wxString wxPyMessageBoxCaptionStr(wxMessageBoxCaptionStr); + +// for compatibility only +#define wxHIDE_READONLY 0 + SWIGINTERN PyObject *wxFileDialog_GetFilenames(wxFileDialog *self){ wxArrayString arr; self->GetFilenames(arr); @@ -33744,6 +33748,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST))); SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE))); SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR))); + SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY))); SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN))); SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE))); SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT))); -- 2.45.2