From 5e4835243a9d77a73e2fe928110edfb6786f7980 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 30 Sep 2004 23:18:30 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/stc/mac/stc.py | 150 ++++++++++++ wxPython/contrib/stc/mac/stc_wrap.cpp | 323 ++++++++++++++++++++++++++ wxPython/contrib/stc/msw/stc.py | 150 ++++++++++++ wxPython/contrib/stc/msw/stc_wrap.cpp | 323 ++++++++++++++++++++++++++ wxPython/src/__windows_rename.i | 1 - wxPython/src/gtk/_windows.py | 14 +- wxPython/src/gtk/_windows_wrap.cpp | 280 +++++++++++----------- wxPython/src/mac/_gdi.py | 23 ++ wxPython/src/mac/_gdi_wrap.cpp | 172 ++++++++++++++ wxPython/src/mac/_windows.py | 18 +- wxPython/src/mac/_windows_wrap.cpp | 309 +++++++++++++----------- wxPython/src/msw/_gdi.py | 31 +++ wxPython/src/msw/_gdi_wrap.cpp | 238 ++++++++++++++++++- wxPython/src/msw/_windows.py | 18 +- wxPython/src/msw/_windows_wrap.cpp | 309 +++++++++++++----------- 15 files changed, 1934 insertions(+), 425 deletions(-) diff --git a/wxPython/contrib/stc/mac/stc.py b/wxPython/contrib/stc/mac/stc.py index 0351196dab..4be679d4d3 100644 --- a/wxPython/contrib/stc/mac/stc.py +++ b/wxPython/contrib/stc/mac/stc.py @@ -134,6 +134,12 @@ STC_FOLDFLAG_BOX = _stc.STC_FOLDFLAG_BOX STC_TIME_FOREVER = _stc.STC_TIME_FOREVER STC_WRAP_NONE = _stc.STC_WRAP_NONE STC_WRAP_WORD = _stc.STC_WRAP_WORD +STC_WRAPVISUALFLAG_NONE = _stc.STC_WRAPVISUALFLAG_NONE +STC_WRAPVISUALFLAG_END = _stc.STC_WRAPVISUALFLAG_END +STC_WRAPVISUALFLAG_START = _stc.STC_WRAPVISUALFLAG_START +STC_WRAPVISUALFLAGLOC_DEFAULT = _stc.STC_WRAPVISUALFLAGLOC_DEFAULT +STC_WRAPVISUALFLAGLOC_END_BY_TEXT = _stc.STC_WRAPVISUALFLAGLOC_END_BY_TEXT +STC_WRAPVISUALFLAGLOC_START_BY_TEXT = _stc.STC_WRAPVISUALFLAGLOC_START_BY_TEXT STC_CACHE_NONE = _stc.STC_CACHE_NONE STC_CACHE_CARET = _stc.STC_CACHE_CARET STC_CACHE_PAGE = _stc.STC_CACHE_PAGE @@ -240,6 +246,14 @@ STC_LEX_POWERBASIC = _stc.STC_LEX_POWERBASIC STC_LEX_FORTH = _stc.STC_LEX_FORTH STC_LEX_ERLANG = _stc.STC_LEX_ERLANG STC_LEX_OCTAVE = _stc.STC_LEX_OCTAVE +STC_LEX_MSSQL = _stc.STC_LEX_MSSQL +STC_LEX_VERILOG = _stc.STC_LEX_VERILOG +STC_LEX_KIX = _stc.STC_LEX_KIX +STC_LEX_GUI4CLI = _stc.STC_LEX_GUI4CLI +STC_LEX_SPECMAN = _stc.STC_LEX_SPECMAN +STC_LEX_AU3 = _stc.STC_LEX_AU3 +STC_LEX_APDL = _stc.STC_LEX_APDL +STC_LEX_BASH = _stc.STC_LEX_BASH STC_LEX_AUTOMATIC = _stc.STC_LEX_AUTOMATIC STC_P_DEFAULT = _stc.STC_P_DEFAULT STC_P_COMMENTLINE = _stc.STC_P_COMMENTLINE @@ -362,6 +376,7 @@ STC_HP_CLASSNAME = _stc.STC_HP_CLASSNAME STC_HP_DEFNAME = _stc.STC_HP_DEFNAME STC_HP_OPERATOR = _stc.STC_HP_OPERATOR STC_HP_IDENTIFIER = _stc.STC_HP_IDENTIFIER +STC_HPHP_COMPLEX_VARIABLE = _stc.STC_HPHP_COMPLEX_VARIABLE STC_HPA_START = _stc.STC_HPA_START STC_HPA_DEFAULT = _stc.STC_HPA_DEFAULT STC_HPA_COMMENTLINE = _stc.STC_HPA_COMMENTLINE @@ -428,6 +443,8 @@ STC_B_STRINGEOL = _stc.STC_B_STRINGEOL STC_B_KEYWORD2 = _stc.STC_B_KEYWORD2 STC_B_KEYWORD3 = _stc.STC_B_KEYWORD3 STC_B_KEYWORD4 = _stc.STC_B_KEYWORD4 +STC_B_CONSTANT = _stc.STC_B_CONSTANT +STC_B_ASM = _stc.STC_B_ASM STC_PROPS_DEFAULT = _stc.STC_PROPS_DEFAULT STC_PROPS_COMMENT = _stc.STC_PROPS_COMMENT STC_PROPS_SECTION = _stc.STC_PROPS_SECTION @@ -477,6 +494,7 @@ STC_ERR_ELF = _stc.STC_ERR_ELF STC_ERR_IFC = _stc.STC_ERR_IFC STC_ERR_IFORT = _stc.STC_ERR_IFORT STC_ERR_ABSF = _stc.STC_ERR_ABSF +STC_ERR_TIDY = _stc.STC_ERR_TIDY STC_BAT_DEFAULT = _stc.STC_BAT_DEFAULT STC_BAT_COMMENT = _stc.STC_BAT_COMMENT STC_BAT_WORD = _stc.STC_BAT_WORD @@ -727,6 +745,7 @@ STC_NSIS_SUBSECTIONDEF = _stc.STC_NSIS_SUBSECTIONDEF STC_NSIS_IFDEFINEDEF = _stc.STC_NSIS_IFDEFINEDEF STC_NSIS_MACRODEF = _stc.STC_NSIS_MACRODEF STC_NSIS_STRINGVAR = _stc.STC_NSIS_STRINGVAR +STC_NSIS_NUMBER = _stc.STC_NSIS_NUMBER STC_MMIXAL_LEADWS = _stc.STC_MMIXAL_LEADWS STC_MMIXAL_COMMENT = _stc.STC_MMIXAL_COMMENT STC_MMIXAL_LABEL = _stc.STC_MMIXAL_LABEL @@ -804,6 +823,109 @@ STC_ERLANG_RECORD = _stc.STC_ERLANG_RECORD STC_ERLANG_SEPARATOR = _stc.STC_ERLANG_SEPARATOR STC_ERLANG_NODE_NAME = _stc.STC_ERLANG_NODE_NAME STC_ERLANG_UNKNOWN = _stc.STC_ERLANG_UNKNOWN +STC_MSSQL_DEFAULT = _stc.STC_MSSQL_DEFAULT +STC_MSSQL_COMMENT = _stc.STC_MSSQL_COMMENT +STC_MSSQL_LINE_COMMENT = _stc.STC_MSSQL_LINE_COMMENT +STC_MSSQL_NUMBER = _stc.STC_MSSQL_NUMBER +STC_MSSQL_STRING = _stc.STC_MSSQL_STRING +STC_MSSQL_OPERATOR = _stc.STC_MSSQL_OPERATOR +STC_MSSQL_IDENTIFIER = _stc.STC_MSSQL_IDENTIFIER +STC_MSSQL_VARIABLE = _stc.STC_MSSQL_VARIABLE +STC_MSSQL_COLUMN_NAME = _stc.STC_MSSQL_COLUMN_NAME +STC_MSSQL_STATEMENT = _stc.STC_MSSQL_STATEMENT +STC_MSSQL_DATATYPE = _stc.STC_MSSQL_DATATYPE +STC_MSSQL_SYSTABLE = _stc.STC_MSSQL_SYSTABLE +STC_MSSQL_GLOBAL_VARIABLE = _stc.STC_MSSQL_GLOBAL_VARIABLE +STC_MSSQL_FUNCTION = _stc.STC_MSSQL_FUNCTION +STC_MSSQL_STORED_PROCEDURE = _stc.STC_MSSQL_STORED_PROCEDURE +STC_MSSQL_DEFAULT_PREF_DATATYPE = _stc.STC_MSSQL_DEFAULT_PREF_DATATYPE +STC_MSSQL_COLUMN_NAME_2 = _stc.STC_MSSQL_COLUMN_NAME_2 +STC_V_DEFAULT = _stc.STC_V_DEFAULT +STC_V_COMMENT = _stc.STC_V_COMMENT +STC_V_COMMENTLINE = _stc.STC_V_COMMENTLINE +STC_V_COMMENTLINEBANG = _stc.STC_V_COMMENTLINEBANG +STC_V_NUMBER = _stc.STC_V_NUMBER +STC_V_WORD = _stc.STC_V_WORD +STC_V_STRING = _stc.STC_V_STRING +STC_V_WORD2 = _stc.STC_V_WORD2 +STC_V_WORD3 = _stc.STC_V_WORD3 +STC_V_PREPROCESSOR = _stc.STC_V_PREPROCESSOR +STC_V_OPERATOR = _stc.STC_V_OPERATOR +STC_V_IDENTIFIER = _stc.STC_V_IDENTIFIER +STC_V_STRINGEOL = _stc.STC_V_STRINGEOL +STC_V_USER = _stc.STC_V_USER +STC_KIX_DEFAULT = _stc.STC_KIX_DEFAULT +STC_KIX_COMMENT = _stc.STC_KIX_COMMENT +STC_KIX_STRING1 = _stc.STC_KIX_STRING1 +STC_KIX_STRING2 = _stc.STC_KIX_STRING2 +STC_KIX_NUMBER = _stc.STC_KIX_NUMBER +STC_KIX_VAR = _stc.STC_KIX_VAR +STC_KIX_MACRO = _stc.STC_KIX_MACRO +STC_KIX_KEYWORD = _stc.STC_KIX_KEYWORD +STC_KIX_FUNCTIONS = _stc.STC_KIX_FUNCTIONS +STC_KIX_OPERATOR = _stc.STC_KIX_OPERATOR +STC_KIX_IDENTIFIER = _stc.STC_KIX_IDENTIFIER +STC_GC_DEFAULT = _stc.STC_GC_DEFAULT +STC_GC_COMMENTLINE = _stc.STC_GC_COMMENTLINE +STC_GC_COMMENTBLOCK = _stc.STC_GC_COMMENTBLOCK +STC_GC_GLOBAL = _stc.STC_GC_GLOBAL +STC_GC_EVENT = _stc.STC_GC_EVENT +STC_GC_ATTRIBUTE = _stc.STC_GC_ATTRIBUTE +STC_GC_CONTROL = _stc.STC_GC_CONTROL +STC_GC_COMMAND = _stc.STC_GC_COMMAND +STC_GC_STRING = _stc.STC_GC_STRING +STC_GC_OPERATOR = _stc.STC_GC_OPERATOR +STC_SN_DEFAULT = _stc.STC_SN_DEFAULT +STC_SN_CODE = _stc.STC_SN_CODE +STC_SN_COMMENTLINE = _stc.STC_SN_COMMENTLINE +STC_SN_COMMENTLINEBANG = _stc.STC_SN_COMMENTLINEBANG +STC_SN_NUMBER = _stc.STC_SN_NUMBER +STC_SN_WORD = _stc.STC_SN_WORD +STC_SN_STRING = _stc.STC_SN_STRING +STC_SN_WORD2 = _stc.STC_SN_WORD2 +STC_SN_WORD3 = _stc.STC_SN_WORD3 +STC_SN_PREPROCESSOR = _stc.STC_SN_PREPROCESSOR +STC_SN_OPERATOR = _stc.STC_SN_OPERATOR +STC_SN_IDENTIFIER = _stc.STC_SN_IDENTIFIER +STC_SN_STRINGEOL = _stc.STC_SN_STRINGEOL +STC_SN_REGEXTAG = _stc.STC_SN_REGEXTAG +STC_SN_SIGNAL = _stc.STC_SN_SIGNAL +STC_SN_USER = _stc.STC_SN_USER +STC_AU3_DEFAULT = _stc.STC_AU3_DEFAULT +STC_AU3_COMMENT = _stc.STC_AU3_COMMENT +STC_AU3_COMMENTBLOCK = _stc.STC_AU3_COMMENTBLOCK +STC_AU3_NUMBER = _stc.STC_AU3_NUMBER +STC_AU3_FUNCTION = _stc.STC_AU3_FUNCTION +STC_AU3_KEYWORD = _stc.STC_AU3_KEYWORD +STC_AU3_MACRO = _stc.STC_AU3_MACRO +STC_AU3_STRING = _stc.STC_AU3_STRING +STC_AU3_OPERATOR = _stc.STC_AU3_OPERATOR +STC_AU3_VARIABLE = _stc.STC_AU3_VARIABLE +STC_AU3_SENT = _stc.STC_AU3_SENT +STC_AU3_PREPROCESSOR = _stc.STC_AU3_PREPROCESSOR +STC_APDL_DEFAULT = _stc.STC_APDL_DEFAULT +STC_APDL_COMMENT = _stc.STC_APDL_COMMENT +STC_APDL_COMMENTBLOCK = _stc.STC_APDL_COMMENTBLOCK +STC_APDL_NUMBER = _stc.STC_APDL_NUMBER +STC_APDL_STRING = _stc.STC_APDL_STRING +STC_APDL_WORD = _stc.STC_APDL_WORD +STC_APDL_COMMAND = _stc.STC_APDL_COMMAND +STC_APDL_PROCESSOR = _stc.STC_APDL_PROCESSOR +STC_APDL_FUNCTION = _stc.STC_APDL_FUNCTION +STC_SH_DEFAULT = _stc.STC_SH_DEFAULT +STC_SH_ERROR = _stc.STC_SH_ERROR +STC_SH_COMMENTLINE = _stc.STC_SH_COMMENTLINE +STC_SH_NUMBER = _stc.STC_SH_NUMBER +STC_SH_WORD = _stc.STC_SH_WORD +STC_SH_STRING = _stc.STC_SH_STRING +STC_SH_CHARACTER = _stc.STC_SH_CHARACTER +STC_SH_OPERATOR = _stc.STC_SH_OPERATOR +STC_SH_IDENTIFIER = _stc.STC_SH_IDENTIFIER +STC_SH_SCALAR = _stc.STC_SH_SCALAR +STC_SH_PARAM = _stc.STC_SH_PARAM +STC_SH_BACKTICKS = _stc.STC_SH_BACKTICKS +STC_SH_HERE_DELIM = _stc.STC_SH_HERE_DELIM +STC_SH_HERE_Q = _stc.STC_SH_HERE_Q STC_CMD_REDO = _stc.STC_CMD_REDO STC_CMD_SELECTALL = _stc.STC_CMD_SELECTALL STC_CMD_UNDO = _stc.STC_CMD_UNDO @@ -1830,6 +1952,30 @@ class StyledTextCtrl(_core.Control): """GetWrapMode(self) -> int""" return _stc.StyledTextCtrl_GetWrapMode(*args, **kwargs) + def SetWrapVisualFlags(*args, **kwargs): + """SetWrapVisualFlags(self, int wrapVisualFlags)""" + return _stc.StyledTextCtrl_SetWrapVisualFlags(*args, **kwargs) + + def GetWrapVisualFlags(*args, **kwargs): + """GetWrapVisualFlags(self) -> int""" + return _stc.StyledTextCtrl_GetWrapVisualFlags(*args, **kwargs) + + def SetWrapVisualFlagsLocation(*args, **kwargs): + """SetWrapVisualFlagsLocation(self, int wrapVisualFlagsLocation)""" + return _stc.StyledTextCtrl_SetWrapVisualFlagsLocation(*args, **kwargs) + + def GetWrapVisualFlagsLocation(*args, **kwargs): + """GetWrapVisualFlagsLocation(self) -> int""" + return _stc.StyledTextCtrl_GetWrapVisualFlagsLocation(*args, **kwargs) + + def SetWrapStartIndent(*args, **kwargs): + """SetWrapStartIndent(self, int indent)""" + return _stc.StyledTextCtrl_SetWrapStartIndent(*args, **kwargs) + + def GetWrapStartIndent(*args, **kwargs): + """GetWrapStartIndent(self) -> int""" + return _stc.StyledTextCtrl_GetWrapStartIndent(*args, **kwargs) + def SetLayoutCache(*args, **kwargs): """SetLayoutCache(self, int mode)""" return _stc.StyledTextCtrl_SetLayoutCache(*args, **kwargs) @@ -2498,6 +2644,10 @@ class StyledTextCtrl(_core.Control): """AutoCompGetCurrent(self) -> int""" return _stc.StyledTextCtrl_AutoCompGetCurrent(*args, **kwargs) + def Allocate(*args, **kwargs): + """Allocate(self, int bytes)""" + return _stc.StyledTextCtrl_Allocate(*args, **kwargs) + def StartRecord(*args, **kwargs): """StartRecord(self)""" return _stc.StyledTextCtrl_StartRecord(*args, **kwargs) diff --git a/wxPython/contrib/stc/mac/stc_wrap.cpp b/wxPython/contrib/stc/mac/stc_wrap.cpp index 6845faef66..5d535c02c4 100644 --- a/wxPython/contrib/stc/mac/stc_wrap.cpp +++ b/wxPython/contrib/stc/mac/stc_wrap.cpp @@ -7762,6 +7762,171 @@ static PyObject *_wrap_StyledTextCtrl_GetWrapMode(PyObject *, PyObject *args, Py } +static PyObject *_wrap_StyledTextCtrl_SetWrapVisualFlags(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "wrapVisualFlags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetWrapVisualFlags",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetWrapVisualFlags(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_GetWrapVisualFlags(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetWrapVisualFlags",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetWrapVisualFlags(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_SetWrapVisualFlagsLocation(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "wrapVisualFlagsLocation", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetWrapVisualFlagsLocation",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetWrapVisualFlagsLocation(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_GetWrapVisualFlagsLocation(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetWrapVisualFlagsLocation",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetWrapVisualFlagsLocation(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_SetWrapStartIndent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "indent", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetWrapStartIndent",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetWrapStartIndent(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_GetWrapStartIndent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetWrapStartIndent",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetWrapStartIndent(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_StyledTextCtrl_SetLayoutCache(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; @@ -12223,6 +12388,35 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetCurrent(PyObject *, PyObject *a } +static PyObject *_wrap_StyledTextCtrl_Allocate(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "bytes", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_Allocate",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->Allocate(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; @@ -14809,6 +15003,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"StyledTextCtrl_WordEndPosition", (PyCFunction) _wrap_StyledTextCtrl_WordEndPosition, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_SetWrapMode, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_GetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_GetWrapMode, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_SetWrapVisualFlags", (PyCFunction) _wrap_StyledTextCtrl_SetWrapVisualFlags, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_GetWrapVisualFlags", (PyCFunction) _wrap_StyledTextCtrl_GetWrapVisualFlags, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_SetWrapVisualFlagsLocation", (PyCFunction) _wrap_StyledTextCtrl_SetWrapVisualFlagsLocation, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_GetWrapVisualFlagsLocation", (PyCFunction) _wrap_StyledTextCtrl_GetWrapVisualFlagsLocation, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_SetWrapStartIndent", (PyCFunction) _wrap_StyledTextCtrl_SetWrapStartIndent, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_GetWrapStartIndent", (PyCFunction) _wrap_StyledTextCtrl_GetWrapStartIndent, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_SetLayoutCache, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_GetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_GetLayoutCache, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetScrollWidth", (PyCFunction) _wrap_StyledTextCtrl_SetScrollWidth, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -14972,6 +15172,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StyledTextCtrl_SetWhitespaceChars", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceChars, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_Allocate", (PyCFunction) _wrap_StyledTextCtrl_Allocate, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -15701,6 +15902,12 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_TIME_FOREVER", SWIG_From_int((int)10000000)); PyDict_SetItemString(d,"STC_WRAP_NONE", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_WRAP_WORD", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAG_NONE", SWIG_From_int((int)0x0000)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAG_END", SWIG_From_int((int)0x0001)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAG_START", SWIG_From_int((int)0x0002)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAGLOC_DEFAULT", SWIG_From_int((int)0x0000)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAGLOC_END_BY_TEXT", SWIG_From_int((int)0x0001)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAGLOC_START_BY_TEXT", SWIG_From_int((int)0x0002)); PyDict_SetItemString(d,"STC_CACHE_NONE", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_CACHE_CARET", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_CACHE_PAGE", SWIG_From_int((int)2)); @@ -15807,6 +16014,14 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_LEX_FORTH", SWIG_From_int((int)52)); PyDict_SetItemString(d,"STC_LEX_ERLANG", SWIG_From_int((int)53)); PyDict_SetItemString(d,"STC_LEX_OCTAVE", SWIG_From_int((int)54)); + PyDict_SetItemString(d,"STC_LEX_MSSQL", SWIG_From_int((int)55)); + PyDict_SetItemString(d,"STC_LEX_VERILOG", SWIG_From_int((int)56)); + PyDict_SetItemString(d,"STC_LEX_KIX", SWIG_From_int((int)57)); + PyDict_SetItemString(d,"STC_LEX_GUI4CLI", SWIG_From_int((int)58)); + PyDict_SetItemString(d,"STC_LEX_SPECMAN", SWIG_From_int((int)59)); + PyDict_SetItemString(d,"STC_LEX_AU3", SWIG_From_int((int)60)); + PyDict_SetItemString(d,"STC_LEX_APDL", SWIG_From_int((int)61)); + PyDict_SetItemString(d,"STC_LEX_BASH", SWIG_From_int((int)62)); PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_From_int((int)1000)); PyDict_SetItemString(d,"STC_P_DEFAULT", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_P_COMMENTLINE", SWIG_From_int((int)1)); @@ -15929,6 +16144,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_HP_DEFNAME", SWIG_From_int((int)100)); PyDict_SetItemString(d,"STC_HP_OPERATOR", SWIG_From_int((int)101)); PyDict_SetItemString(d,"STC_HP_IDENTIFIER", SWIG_From_int((int)102)); + PyDict_SetItemString(d,"STC_HPHP_COMPLEX_VARIABLE", SWIG_From_int((int)104)); PyDict_SetItemString(d,"STC_HPA_START", SWIG_From_int((int)105)); PyDict_SetItemString(d,"STC_HPA_DEFAULT", SWIG_From_int((int)106)); PyDict_SetItemString(d,"STC_HPA_COMMENTLINE", SWIG_From_int((int)107)); @@ -15995,6 +16211,8 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_B_KEYWORD2", SWIG_From_int((int)10)); PyDict_SetItemString(d,"STC_B_KEYWORD3", SWIG_From_int((int)11)); PyDict_SetItemString(d,"STC_B_KEYWORD4", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_B_CONSTANT", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_B_ASM", SWIG_From_int((int)14)); PyDict_SetItemString(d,"STC_PROPS_DEFAULT", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_PROPS_COMMENT", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_PROPS_SECTION", SWIG_From_int((int)2)); @@ -16044,6 +16262,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_ERR_IFC", SWIG_From_int((int)16)); PyDict_SetItemString(d,"STC_ERR_IFORT", SWIG_From_int((int)17)); PyDict_SetItemString(d,"STC_ERR_ABSF", SWIG_From_int((int)18)); + PyDict_SetItemString(d,"STC_ERR_TIDY", SWIG_From_int((int)19)); PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_BAT_COMMENT", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_BAT_WORD", SWIG_From_int((int)2)); @@ -16294,6 +16513,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_NSIS_IFDEFINEDEF", SWIG_From_int((int)11)); PyDict_SetItemString(d,"STC_NSIS_MACRODEF", SWIG_From_int((int)12)); PyDict_SetItemString(d,"STC_NSIS_STRINGVAR", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_NSIS_NUMBER", SWIG_From_int((int)14)); PyDict_SetItemString(d,"STC_MMIXAL_LEADWS", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_MMIXAL_COMMENT", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_MMIXAL_LABEL", SWIG_From_int((int)2)); @@ -16371,6 +16591,109 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_ERLANG_SEPARATOR", SWIG_From_int((int)12)); PyDict_SetItemString(d,"STC_ERLANG_NODE_NAME", SWIG_From_int((int)13)); PyDict_SetItemString(d,"STC_ERLANG_UNKNOWN", SWIG_From_int((int)31)); + PyDict_SetItemString(d,"STC_MSSQL_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_MSSQL_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_MSSQL_LINE_COMMENT", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_MSSQL_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_MSSQL_STRING", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_MSSQL_OPERATOR", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_MSSQL_IDENTIFIER", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_MSSQL_VARIABLE", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_MSSQL_COLUMN_NAME", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_MSSQL_STATEMENT", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_MSSQL_DATATYPE", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_MSSQL_SYSTABLE", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_MSSQL_GLOBAL_VARIABLE", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_MSSQL_FUNCTION", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_MSSQL_STORED_PROCEDURE", SWIG_From_int((int)14)); + PyDict_SetItemString(d,"STC_MSSQL_DEFAULT_PREF_DATATYPE", SWIG_From_int((int)15)); + PyDict_SetItemString(d,"STC_MSSQL_COLUMN_NAME_2", SWIG_From_int((int)16)); + PyDict_SetItemString(d,"STC_V_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_V_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_V_COMMENTLINE", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_V_COMMENTLINEBANG", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_V_NUMBER", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_V_WORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_V_STRING", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_V_WORD2", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_V_WORD3", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_V_PREPROCESSOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_V_OPERATOR", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_V_IDENTIFIER", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_V_STRINGEOL", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_V_USER", SWIG_From_int((int)19)); + PyDict_SetItemString(d,"STC_KIX_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_KIX_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_KIX_STRING1", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_KIX_STRING2", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_KIX_NUMBER", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_KIX_VAR", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_KIX_MACRO", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_KIX_KEYWORD", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_KIX_FUNCTIONS", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_KIX_OPERATOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_KIX_IDENTIFIER", SWIG_From_int((int)31)); + PyDict_SetItemString(d,"STC_GC_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_GC_COMMENTLINE", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_GC_COMMENTBLOCK", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_GC_GLOBAL", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_GC_EVENT", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_GC_ATTRIBUTE", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_GC_CONTROL", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_GC_COMMAND", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_GC_STRING", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_GC_OPERATOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_SN_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_SN_CODE", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_SN_COMMENTLINE", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_SN_COMMENTLINEBANG", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_SN_NUMBER", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_SN_WORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_SN_STRING", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_SN_WORD2", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_SN_WORD3", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_SN_PREPROCESSOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_SN_OPERATOR", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_SN_IDENTIFIER", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_SN_STRINGEOL", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_SN_REGEXTAG", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_SN_SIGNAL", SWIG_From_int((int)14)); + PyDict_SetItemString(d,"STC_SN_USER", SWIG_From_int((int)19)); + PyDict_SetItemString(d,"STC_AU3_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_AU3_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_AU3_COMMENTBLOCK", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_AU3_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_AU3_FUNCTION", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_AU3_KEYWORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_AU3_MACRO", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_AU3_STRING", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_AU3_OPERATOR", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_AU3_VARIABLE", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_AU3_SENT", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_AU3_PREPROCESSOR", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_APDL_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_APDL_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_APDL_COMMENTBLOCK", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_APDL_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_APDL_STRING", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_APDL_WORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_APDL_COMMAND", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_APDL_PROCESSOR", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_APDL_FUNCTION", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_SH_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_SH_ERROR", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_SH_COMMENTLINE", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_SH_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_SH_WORD", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_SH_STRING", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_SH_CHARACTER", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_SH_OPERATOR", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_SH_IDENTIFIER", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_SH_SCALAR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_SH_PARAM", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_SH_BACKTICKS", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_SH_HERE_DELIM", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_SH_HERE_Q", SWIG_From_int((int)13)); PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_From_int((int)2011)); PyDict_SetItemString(d,"STC_CMD_SELECTALL", SWIG_From_int((int)2013)); PyDict_SetItemString(d,"STC_CMD_UNDO", SWIG_From_int((int)2176)); diff --git a/wxPython/contrib/stc/msw/stc.py b/wxPython/contrib/stc/msw/stc.py index 0351196dab..4be679d4d3 100644 --- a/wxPython/contrib/stc/msw/stc.py +++ b/wxPython/contrib/stc/msw/stc.py @@ -134,6 +134,12 @@ STC_FOLDFLAG_BOX = _stc.STC_FOLDFLAG_BOX STC_TIME_FOREVER = _stc.STC_TIME_FOREVER STC_WRAP_NONE = _stc.STC_WRAP_NONE STC_WRAP_WORD = _stc.STC_WRAP_WORD +STC_WRAPVISUALFLAG_NONE = _stc.STC_WRAPVISUALFLAG_NONE +STC_WRAPVISUALFLAG_END = _stc.STC_WRAPVISUALFLAG_END +STC_WRAPVISUALFLAG_START = _stc.STC_WRAPVISUALFLAG_START +STC_WRAPVISUALFLAGLOC_DEFAULT = _stc.STC_WRAPVISUALFLAGLOC_DEFAULT +STC_WRAPVISUALFLAGLOC_END_BY_TEXT = _stc.STC_WRAPVISUALFLAGLOC_END_BY_TEXT +STC_WRAPVISUALFLAGLOC_START_BY_TEXT = _stc.STC_WRAPVISUALFLAGLOC_START_BY_TEXT STC_CACHE_NONE = _stc.STC_CACHE_NONE STC_CACHE_CARET = _stc.STC_CACHE_CARET STC_CACHE_PAGE = _stc.STC_CACHE_PAGE @@ -240,6 +246,14 @@ STC_LEX_POWERBASIC = _stc.STC_LEX_POWERBASIC STC_LEX_FORTH = _stc.STC_LEX_FORTH STC_LEX_ERLANG = _stc.STC_LEX_ERLANG STC_LEX_OCTAVE = _stc.STC_LEX_OCTAVE +STC_LEX_MSSQL = _stc.STC_LEX_MSSQL +STC_LEX_VERILOG = _stc.STC_LEX_VERILOG +STC_LEX_KIX = _stc.STC_LEX_KIX +STC_LEX_GUI4CLI = _stc.STC_LEX_GUI4CLI +STC_LEX_SPECMAN = _stc.STC_LEX_SPECMAN +STC_LEX_AU3 = _stc.STC_LEX_AU3 +STC_LEX_APDL = _stc.STC_LEX_APDL +STC_LEX_BASH = _stc.STC_LEX_BASH STC_LEX_AUTOMATIC = _stc.STC_LEX_AUTOMATIC STC_P_DEFAULT = _stc.STC_P_DEFAULT STC_P_COMMENTLINE = _stc.STC_P_COMMENTLINE @@ -362,6 +376,7 @@ STC_HP_CLASSNAME = _stc.STC_HP_CLASSNAME STC_HP_DEFNAME = _stc.STC_HP_DEFNAME STC_HP_OPERATOR = _stc.STC_HP_OPERATOR STC_HP_IDENTIFIER = _stc.STC_HP_IDENTIFIER +STC_HPHP_COMPLEX_VARIABLE = _stc.STC_HPHP_COMPLEX_VARIABLE STC_HPA_START = _stc.STC_HPA_START STC_HPA_DEFAULT = _stc.STC_HPA_DEFAULT STC_HPA_COMMENTLINE = _stc.STC_HPA_COMMENTLINE @@ -428,6 +443,8 @@ STC_B_STRINGEOL = _stc.STC_B_STRINGEOL STC_B_KEYWORD2 = _stc.STC_B_KEYWORD2 STC_B_KEYWORD3 = _stc.STC_B_KEYWORD3 STC_B_KEYWORD4 = _stc.STC_B_KEYWORD4 +STC_B_CONSTANT = _stc.STC_B_CONSTANT +STC_B_ASM = _stc.STC_B_ASM STC_PROPS_DEFAULT = _stc.STC_PROPS_DEFAULT STC_PROPS_COMMENT = _stc.STC_PROPS_COMMENT STC_PROPS_SECTION = _stc.STC_PROPS_SECTION @@ -477,6 +494,7 @@ STC_ERR_ELF = _stc.STC_ERR_ELF STC_ERR_IFC = _stc.STC_ERR_IFC STC_ERR_IFORT = _stc.STC_ERR_IFORT STC_ERR_ABSF = _stc.STC_ERR_ABSF +STC_ERR_TIDY = _stc.STC_ERR_TIDY STC_BAT_DEFAULT = _stc.STC_BAT_DEFAULT STC_BAT_COMMENT = _stc.STC_BAT_COMMENT STC_BAT_WORD = _stc.STC_BAT_WORD @@ -727,6 +745,7 @@ STC_NSIS_SUBSECTIONDEF = _stc.STC_NSIS_SUBSECTIONDEF STC_NSIS_IFDEFINEDEF = _stc.STC_NSIS_IFDEFINEDEF STC_NSIS_MACRODEF = _stc.STC_NSIS_MACRODEF STC_NSIS_STRINGVAR = _stc.STC_NSIS_STRINGVAR +STC_NSIS_NUMBER = _stc.STC_NSIS_NUMBER STC_MMIXAL_LEADWS = _stc.STC_MMIXAL_LEADWS STC_MMIXAL_COMMENT = _stc.STC_MMIXAL_COMMENT STC_MMIXAL_LABEL = _stc.STC_MMIXAL_LABEL @@ -804,6 +823,109 @@ STC_ERLANG_RECORD = _stc.STC_ERLANG_RECORD STC_ERLANG_SEPARATOR = _stc.STC_ERLANG_SEPARATOR STC_ERLANG_NODE_NAME = _stc.STC_ERLANG_NODE_NAME STC_ERLANG_UNKNOWN = _stc.STC_ERLANG_UNKNOWN +STC_MSSQL_DEFAULT = _stc.STC_MSSQL_DEFAULT +STC_MSSQL_COMMENT = _stc.STC_MSSQL_COMMENT +STC_MSSQL_LINE_COMMENT = _stc.STC_MSSQL_LINE_COMMENT +STC_MSSQL_NUMBER = _stc.STC_MSSQL_NUMBER +STC_MSSQL_STRING = _stc.STC_MSSQL_STRING +STC_MSSQL_OPERATOR = _stc.STC_MSSQL_OPERATOR +STC_MSSQL_IDENTIFIER = _stc.STC_MSSQL_IDENTIFIER +STC_MSSQL_VARIABLE = _stc.STC_MSSQL_VARIABLE +STC_MSSQL_COLUMN_NAME = _stc.STC_MSSQL_COLUMN_NAME +STC_MSSQL_STATEMENT = _stc.STC_MSSQL_STATEMENT +STC_MSSQL_DATATYPE = _stc.STC_MSSQL_DATATYPE +STC_MSSQL_SYSTABLE = _stc.STC_MSSQL_SYSTABLE +STC_MSSQL_GLOBAL_VARIABLE = _stc.STC_MSSQL_GLOBAL_VARIABLE +STC_MSSQL_FUNCTION = _stc.STC_MSSQL_FUNCTION +STC_MSSQL_STORED_PROCEDURE = _stc.STC_MSSQL_STORED_PROCEDURE +STC_MSSQL_DEFAULT_PREF_DATATYPE = _stc.STC_MSSQL_DEFAULT_PREF_DATATYPE +STC_MSSQL_COLUMN_NAME_2 = _stc.STC_MSSQL_COLUMN_NAME_2 +STC_V_DEFAULT = _stc.STC_V_DEFAULT +STC_V_COMMENT = _stc.STC_V_COMMENT +STC_V_COMMENTLINE = _stc.STC_V_COMMENTLINE +STC_V_COMMENTLINEBANG = _stc.STC_V_COMMENTLINEBANG +STC_V_NUMBER = _stc.STC_V_NUMBER +STC_V_WORD = _stc.STC_V_WORD +STC_V_STRING = _stc.STC_V_STRING +STC_V_WORD2 = _stc.STC_V_WORD2 +STC_V_WORD3 = _stc.STC_V_WORD3 +STC_V_PREPROCESSOR = _stc.STC_V_PREPROCESSOR +STC_V_OPERATOR = _stc.STC_V_OPERATOR +STC_V_IDENTIFIER = _stc.STC_V_IDENTIFIER +STC_V_STRINGEOL = _stc.STC_V_STRINGEOL +STC_V_USER = _stc.STC_V_USER +STC_KIX_DEFAULT = _stc.STC_KIX_DEFAULT +STC_KIX_COMMENT = _stc.STC_KIX_COMMENT +STC_KIX_STRING1 = _stc.STC_KIX_STRING1 +STC_KIX_STRING2 = _stc.STC_KIX_STRING2 +STC_KIX_NUMBER = _stc.STC_KIX_NUMBER +STC_KIX_VAR = _stc.STC_KIX_VAR +STC_KIX_MACRO = _stc.STC_KIX_MACRO +STC_KIX_KEYWORD = _stc.STC_KIX_KEYWORD +STC_KIX_FUNCTIONS = _stc.STC_KIX_FUNCTIONS +STC_KIX_OPERATOR = _stc.STC_KIX_OPERATOR +STC_KIX_IDENTIFIER = _stc.STC_KIX_IDENTIFIER +STC_GC_DEFAULT = _stc.STC_GC_DEFAULT +STC_GC_COMMENTLINE = _stc.STC_GC_COMMENTLINE +STC_GC_COMMENTBLOCK = _stc.STC_GC_COMMENTBLOCK +STC_GC_GLOBAL = _stc.STC_GC_GLOBAL +STC_GC_EVENT = _stc.STC_GC_EVENT +STC_GC_ATTRIBUTE = _stc.STC_GC_ATTRIBUTE +STC_GC_CONTROL = _stc.STC_GC_CONTROL +STC_GC_COMMAND = _stc.STC_GC_COMMAND +STC_GC_STRING = _stc.STC_GC_STRING +STC_GC_OPERATOR = _stc.STC_GC_OPERATOR +STC_SN_DEFAULT = _stc.STC_SN_DEFAULT +STC_SN_CODE = _stc.STC_SN_CODE +STC_SN_COMMENTLINE = _stc.STC_SN_COMMENTLINE +STC_SN_COMMENTLINEBANG = _stc.STC_SN_COMMENTLINEBANG +STC_SN_NUMBER = _stc.STC_SN_NUMBER +STC_SN_WORD = _stc.STC_SN_WORD +STC_SN_STRING = _stc.STC_SN_STRING +STC_SN_WORD2 = _stc.STC_SN_WORD2 +STC_SN_WORD3 = _stc.STC_SN_WORD3 +STC_SN_PREPROCESSOR = _stc.STC_SN_PREPROCESSOR +STC_SN_OPERATOR = _stc.STC_SN_OPERATOR +STC_SN_IDENTIFIER = _stc.STC_SN_IDENTIFIER +STC_SN_STRINGEOL = _stc.STC_SN_STRINGEOL +STC_SN_REGEXTAG = _stc.STC_SN_REGEXTAG +STC_SN_SIGNAL = _stc.STC_SN_SIGNAL +STC_SN_USER = _stc.STC_SN_USER +STC_AU3_DEFAULT = _stc.STC_AU3_DEFAULT +STC_AU3_COMMENT = _stc.STC_AU3_COMMENT +STC_AU3_COMMENTBLOCK = _stc.STC_AU3_COMMENTBLOCK +STC_AU3_NUMBER = _stc.STC_AU3_NUMBER +STC_AU3_FUNCTION = _stc.STC_AU3_FUNCTION +STC_AU3_KEYWORD = _stc.STC_AU3_KEYWORD +STC_AU3_MACRO = _stc.STC_AU3_MACRO +STC_AU3_STRING = _stc.STC_AU3_STRING +STC_AU3_OPERATOR = _stc.STC_AU3_OPERATOR +STC_AU3_VARIABLE = _stc.STC_AU3_VARIABLE +STC_AU3_SENT = _stc.STC_AU3_SENT +STC_AU3_PREPROCESSOR = _stc.STC_AU3_PREPROCESSOR +STC_APDL_DEFAULT = _stc.STC_APDL_DEFAULT +STC_APDL_COMMENT = _stc.STC_APDL_COMMENT +STC_APDL_COMMENTBLOCK = _stc.STC_APDL_COMMENTBLOCK +STC_APDL_NUMBER = _stc.STC_APDL_NUMBER +STC_APDL_STRING = _stc.STC_APDL_STRING +STC_APDL_WORD = _stc.STC_APDL_WORD +STC_APDL_COMMAND = _stc.STC_APDL_COMMAND +STC_APDL_PROCESSOR = _stc.STC_APDL_PROCESSOR +STC_APDL_FUNCTION = _stc.STC_APDL_FUNCTION +STC_SH_DEFAULT = _stc.STC_SH_DEFAULT +STC_SH_ERROR = _stc.STC_SH_ERROR +STC_SH_COMMENTLINE = _stc.STC_SH_COMMENTLINE +STC_SH_NUMBER = _stc.STC_SH_NUMBER +STC_SH_WORD = _stc.STC_SH_WORD +STC_SH_STRING = _stc.STC_SH_STRING +STC_SH_CHARACTER = _stc.STC_SH_CHARACTER +STC_SH_OPERATOR = _stc.STC_SH_OPERATOR +STC_SH_IDENTIFIER = _stc.STC_SH_IDENTIFIER +STC_SH_SCALAR = _stc.STC_SH_SCALAR +STC_SH_PARAM = _stc.STC_SH_PARAM +STC_SH_BACKTICKS = _stc.STC_SH_BACKTICKS +STC_SH_HERE_DELIM = _stc.STC_SH_HERE_DELIM +STC_SH_HERE_Q = _stc.STC_SH_HERE_Q STC_CMD_REDO = _stc.STC_CMD_REDO STC_CMD_SELECTALL = _stc.STC_CMD_SELECTALL STC_CMD_UNDO = _stc.STC_CMD_UNDO @@ -1830,6 +1952,30 @@ class StyledTextCtrl(_core.Control): """GetWrapMode(self) -> int""" return _stc.StyledTextCtrl_GetWrapMode(*args, **kwargs) + def SetWrapVisualFlags(*args, **kwargs): + """SetWrapVisualFlags(self, int wrapVisualFlags)""" + return _stc.StyledTextCtrl_SetWrapVisualFlags(*args, **kwargs) + + def GetWrapVisualFlags(*args, **kwargs): + """GetWrapVisualFlags(self) -> int""" + return _stc.StyledTextCtrl_GetWrapVisualFlags(*args, **kwargs) + + def SetWrapVisualFlagsLocation(*args, **kwargs): + """SetWrapVisualFlagsLocation(self, int wrapVisualFlagsLocation)""" + return _stc.StyledTextCtrl_SetWrapVisualFlagsLocation(*args, **kwargs) + + def GetWrapVisualFlagsLocation(*args, **kwargs): + """GetWrapVisualFlagsLocation(self) -> int""" + return _stc.StyledTextCtrl_GetWrapVisualFlagsLocation(*args, **kwargs) + + def SetWrapStartIndent(*args, **kwargs): + """SetWrapStartIndent(self, int indent)""" + return _stc.StyledTextCtrl_SetWrapStartIndent(*args, **kwargs) + + def GetWrapStartIndent(*args, **kwargs): + """GetWrapStartIndent(self) -> int""" + return _stc.StyledTextCtrl_GetWrapStartIndent(*args, **kwargs) + def SetLayoutCache(*args, **kwargs): """SetLayoutCache(self, int mode)""" return _stc.StyledTextCtrl_SetLayoutCache(*args, **kwargs) @@ -2498,6 +2644,10 @@ class StyledTextCtrl(_core.Control): """AutoCompGetCurrent(self) -> int""" return _stc.StyledTextCtrl_AutoCompGetCurrent(*args, **kwargs) + def Allocate(*args, **kwargs): + """Allocate(self, int bytes)""" + return _stc.StyledTextCtrl_Allocate(*args, **kwargs) + def StartRecord(*args, **kwargs): """StartRecord(self)""" return _stc.StyledTextCtrl_StartRecord(*args, **kwargs) diff --git a/wxPython/contrib/stc/msw/stc_wrap.cpp b/wxPython/contrib/stc/msw/stc_wrap.cpp index 1dfb791106..fbc64f663b 100644 --- a/wxPython/contrib/stc/msw/stc_wrap.cpp +++ b/wxPython/contrib/stc/msw/stc_wrap.cpp @@ -7762,6 +7762,171 @@ static PyObject *_wrap_StyledTextCtrl_GetWrapMode(PyObject *, PyObject *args, Py } +static PyObject *_wrap_StyledTextCtrl_SetWrapVisualFlags(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "wrapVisualFlags", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetWrapVisualFlags",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetWrapVisualFlags(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_GetWrapVisualFlags(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetWrapVisualFlags",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetWrapVisualFlags(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_SetWrapVisualFlagsLocation(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "wrapVisualFlagsLocation", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetWrapVisualFlagsLocation",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetWrapVisualFlagsLocation(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_GetWrapVisualFlagsLocation(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetWrapVisualFlagsLocation",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetWrapVisualFlagsLocation(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_SetWrapStartIndent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "indent", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetWrapStartIndent",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetWrapStartIndent(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_StyledTextCtrl_GetWrapStartIndent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetWrapStartIndent",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetWrapStartIndent(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((int)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_StyledTextCtrl_SetLayoutCache(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; @@ -12223,6 +12388,35 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetCurrent(PyObject *, PyObject *a } +static PyObject *_wrap_StyledTextCtrl_Allocate(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "bytes", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_Allocate",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->Allocate(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ; @@ -14809,6 +15003,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"StyledTextCtrl_WordEndPosition", (PyCFunction) _wrap_StyledTextCtrl_WordEndPosition, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_SetWrapMode, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_GetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_GetWrapMode, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_SetWrapVisualFlags", (PyCFunction) _wrap_StyledTextCtrl_SetWrapVisualFlags, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_GetWrapVisualFlags", (PyCFunction) _wrap_StyledTextCtrl_GetWrapVisualFlags, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_SetWrapVisualFlagsLocation", (PyCFunction) _wrap_StyledTextCtrl_SetWrapVisualFlagsLocation, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_GetWrapVisualFlagsLocation", (PyCFunction) _wrap_StyledTextCtrl_GetWrapVisualFlagsLocation, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_SetWrapStartIndent", (PyCFunction) _wrap_StyledTextCtrl_SetWrapStartIndent, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_GetWrapStartIndent", (PyCFunction) _wrap_StyledTextCtrl_GetWrapStartIndent, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_SetLayoutCache, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_GetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_GetLayoutCache, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetScrollWidth", (PyCFunction) _wrap_StyledTextCtrl_SetScrollWidth, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -14972,6 +15172,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StyledTextCtrl_SetWhitespaceChars", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceChars, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"StyledTextCtrl_Allocate", (PyCFunction) _wrap_StyledTextCtrl_Allocate, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -15701,6 +15902,12 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_TIME_FOREVER", SWIG_From_int((int)10000000)); PyDict_SetItemString(d,"STC_WRAP_NONE", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_WRAP_WORD", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAG_NONE", SWIG_From_int((int)0x0000)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAG_END", SWIG_From_int((int)0x0001)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAG_START", SWIG_From_int((int)0x0002)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAGLOC_DEFAULT", SWIG_From_int((int)0x0000)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAGLOC_END_BY_TEXT", SWIG_From_int((int)0x0001)); + PyDict_SetItemString(d,"STC_WRAPVISUALFLAGLOC_START_BY_TEXT", SWIG_From_int((int)0x0002)); PyDict_SetItemString(d,"STC_CACHE_NONE", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_CACHE_CARET", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_CACHE_PAGE", SWIG_From_int((int)2)); @@ -15807,6 +16014,14 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_LEX_FORTH", SWIG_From_int((int)52)); PyDict_SetItemString(d,"STC_LEX_ERLANG", SWIG_From_int((int)53)); PyDict_SetItemString(d,"STC_LEX_OCTAVE", SWIG_From_int((int)54)); + PyDict_SetItemString(d,"STC_LEX_MSSQL", SWIG_From_int((int)55)); + PyDict_SetItemString(d,"STC_LEX_VERILOG", SWIG_From_int((int)56)); + PyDict_SetItemString(d,"STC_LEX_KIX", SWIG_From_int((int)57)); + PyDict_SetItemString(d,"STC_LEX_GUI4CLI", SWIG_From_int((int)58)); + PyDict_SetItemString(d,"STC_LEX_SPECMAN", SWIG_From_int((int)59)); + PyDict_SetItemString(d,"STC_LEX_AU3", SWIG_From_int((int)60)); + PyDict_SetItemString(d,"STC_LEX_APDL", SWIG_From_int((int)61)); + PyDict_SetItemString(d,"STC_LEX_BASH", SWIG_From_int((int)62)); PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_From_int((int)1000)); PyDict_SetItemString(d,"STC_P_DEFAULT", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_P_COMMENTLINE", SWIG_From_int((int)1)); @@ -15929,6 +16144,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_HP_DEFNAME", SWIG_From_int((int)100)); PyDict_SetItemString(d,"STC_HP_OPERATOR", SWIG_From_int((int)101)); PyDict_SetItemString(d,"STC_HP_IDENTIFIER", SWIG_From_int((int)102)); + PyDict_SetItemString(d,"STC_HPHP_COMPLEX_VARIABLE", SWIG_From_int((int)104)); PyDict_SetItemString(d,"STC_HPA_START", SWIG_From_int((int)105)); PyDict_SetItemString(d,"STC_HPA_DEFAULT", SWIG_From_int((int)106)); PyDict_SetItemString(d,"STC_HPA_COMMENTLINE", SWIG_From_int((int)107)); @@ -15995,6 +16211,8 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_B_KEYWORD2", SWIG_From_int((int)10)); PyDict_SetItemString(d,"STC_B_KEYWORD3", SWIG_From_int((int)11)); PyDict_SetItemString(d,"STC_B_KEYWORD4", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_B_CONSTANT", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_B_ASM", SWIG_From_int((int)14)); PyDict_SetItemString(d,"STC_PROPS_DEFAULT", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_PROPS_COMMENT", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_PROPS_SECTION", SWIG_From_int((int)2)); @@ -16044,6 +16262,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_ERR_IFC", SWIG_From_int((int)16)); PyDict_SetItemString(d,"STC_ERR_IFORT", SWIG_From_int((int)17)); PyDict_SetItemString(d,"STC_ERR_ABSF", SWIG_From_int((int)18)); + PyDict_SetItemString(d,"STC_ERR_TIDY", SWIG_From_int((int)19)); PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_BAT_COMMENT", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_BAT_WORD", SWIG_From_int((int)2)); @@ -16294,6 +16513,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_NSIS_IFDEFINEDEF", SWIG_From_int((int)11)); PyDict_SetItemString(d,"STC_NSIS_MACRODEF", SWIG_From_int((int)12)); PyDict_SetItemString(d,"STC_NSIS_STRINGVAR", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_NSIS_NUMBER", SWIG_From_int((int)14)); PyDict_SetItemString(d,"STC_MMIXAL_LEADWS", SWIG_From_int((int)0)); PyDict_SetItemString(d,"STC_MMIXAL_COMMENT", SWIG_From_int((int)1)); PyDict_SetItemString(d,"STC_MMIXAL_LABEL", SWIG_From_int((int)2)); @@ -16371,6 +16591,109 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STC_ERLANG_SEPARATOR", SWIG_From_int((int)12)); PyDict_SetItemString(d,"STC_ERLANG_NODE_NAME", SWIG_From_int((int)13)); PyDict_SetItemString(d,"STC_ERLANG_UNKNOWN", SWIG_From_int((int)31)); + PyDict_SetItemString(d,"STC_MSSQL_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_MSSQL_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_MSSQL_LINE_COMMENT", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_MSSQL_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_MSSQL_STRING", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_MSSQL_OPERATOR", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_MSSQL_IDENTIFIER", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_MSSQL_VARIABLE", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_MSSQL_COLUMN_NAME", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_MSSQL_STATEMENT", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_MSSQL_DATATYPE", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_MSSQL_SYSTABLE", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_MSSQL_GLOBAL_VARIABLE", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_MSSQL_FUNCTION", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_MSSQL_STORED_PROCEDURE", SWIG_From_int((int)14)); + PyDict_SetItemString(d,"STC_MSSQL_DEFAULT_PREF_DATATYPE", SWIG_From_int((int)15)); + PyDict_SetItemString(d,"STC_MSSQL_COLUMN_NAME_2", SWIG_From_int((int)16)); + PyDict_SetItemString(d,"STC_V_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_V_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_V_COMMENTLINE", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_V_COMMENTLINEBANG", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_V_NUMBER", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_V_WORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_V_STRING", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_V_WORD2", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_V_WORD3", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_V_PREPROCESSOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_V_OPERATOR", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_V_IDENTIFIER", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_V_STRINGEOL", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_V_USER", SWIG_From_int((int)19)); + PyDict_SetItemString(d,"STC_KIX_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_KIX_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_KIX_STRING1", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_KIX_STRING2", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_KIX_NUMBER", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_KIX_VAR", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_KIX_MACRO", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_KIX_KEYWORD", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_KIX_FUNCTIONS", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_KIX_OPERATOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_KIX_IDENTIFIER", SWIG_From_int((int)31)); + PyDict_SetItemString(d,"STC_GC_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_GC_COMMENTLINE", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_GC_COMMENTBLOCK", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_GC_GLOBAL", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_GC_EVENT", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_GC_ATTRIBUTE", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_GC_CONTROL", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_GC_COMMAND", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_GC_STRING", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_GC_OPERATOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_SN_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_SN_CODE", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_SN_COMMENTLINE", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_SN_COMMENTLINEBANG", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_SN_NUMBER", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_SN_WORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_SN_STRING", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_SN_WORD2", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_SN_WORD3", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_SN_PREPROCESSOR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_SN_OPERATOR", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_SN_IDENTIFIER", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_SN_STRINGEOL", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_SN_REGEXTAG", SWIG_From_int((int)13)); + PyDict_SetItemString(d,"STC_SN_SIGNAL", SWIG_From_int((int)14)); + PyDict_SetItemString(d,"STC_SN_USER", SWIG_From_int((int)19)); + PyDict_SetItemString(d,"STC_AU3_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_AU3_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_AU3_COMMENTBLOCK", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_AU3_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_AU3_FUNCTION", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_AU3_KEYWORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_AU3_MACRO", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_AU3_STRING", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_AU3_OPERATOR", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_AU3_VARIABLE", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_AU3_SENT", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_AU3_PREPROCESSOR", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_APDL_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_APDL_COMMENT", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_APDL_COMMENTBLOCK", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_APDL_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_APDL_STRING", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_APDL_WORD", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_APDL_COMMAND", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_APDL_PROCESSOR", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_APDL_FUNCTION", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_SH_DEFAULT", SWIG_From_int((int)0)); + PyDict_SetItemString(d,"STC_SH_ERROR", SWIG_From_int((int)1)); + PyDict_SetItemString(d,"STC_SH_COMMENTLINE", SWIG_From_int((int)2)); + PyDict_SetItemString(d,"STC_SH_NUMBER", SWIG_From_int((int)3)); + PyDict_SetItemString(d,"STC_SH_WORD", SWIG_From_int((int)4)); + PyDict_SetItemString(d,"STC_SH_STRING", SWIG_From_int((int)5)); + PyDict_SetItemString(d,"STC_SH_CHARACTER", SWIG_From_int((int)6)); + PyDict_SetItemString(d,"STC_SH_OPERATOR", SWIG_From_int((int)7)); + PyDict_SetItemString(d,"STC_SH_IDENTIFIER", SWIG_From_int((int)8)); + PyDict_SetItemString(d,"STC_SH_SCALAR", SWIG_From_int((int)9)); + PyDict_SetItemString(d,"STC_SH_PARAM", SWIG_From_int((int)10)); + PyDict_SetItemString(d,"STC_SH_BACKTICKS", SWIG_From_int((int)11)); + PyDict_SetItemString(d,"STC_SH_HERE_DELIM", SWIG_From_int((int)12)); + PyDict_SetItemString(d,"STC_SH_HERE_Q", SWIG_From_int((int)13)); PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_From_int((int)2011)); PyDict_SetItemString(d,"STC_CMD_SELECTALL", SWIG_From_int((int)2013)); PyDict_SetItemString(d,"STC_CMD_UNDO", SWIG_From_int((int)2176)); diff --git a/wxPython/src/__windows_rename.i b/wxPython/src/__windows_rename.i index 911445f754..da4522a8e4 100644 --- a/wxPython/src/__windows_rename.i +++ b/wxPython/src/__windows_rename.i @@ -105,7 +105,6 @@ %rename(LayoutAlgorithm) wxLayoutAlgorithm; %rename(PopupWindow) wxPopupWindow; %rename(TipWindow) wxTipWindow; -%rename(TaskBarIcon) wxTaskBarIcon; %rename(TaskBarIconEvent) wxTaskBarIconEvent; %rename(ColourData) wxColourData; %rename(ColourDialog) wxColourDialog; diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 1899cc1172..a970721b6d 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -2050,18 +2050,18 @@ def PreHtmlListBox(*args, **kwargs): class TaskBarIcon(_core.EvtHandler): def __repr__(self): - return "<%s.%s; proxy of C++ wxTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + return "<%s.%s; proxy of C++ wxPyTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """__init__(self) -> TaskBarIcon""" newobj = _windows_.new_TaskBarIcon(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown - def __del__(self, destroy=_windows_.delete_TaskBarIcon): - """__del__(self)""" - try: - if self.thisown: destroy(self) - except: pass + self._setCallbackInfo(self, TaskBarIcon, 0) + + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)""" + return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs) def Destroy(*args, **kwargs): """ @@ -2104,7 +2104,7 @@ class TaskBarIconEvent(_core.Event): def __repr__(self): return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, wxEventType evtType, TaskBarIcon tbIcon) -> TaskBarIconEvent""" + """__init__(self, wxEventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent""" newobj = _windows_.new_TaskBarIconEvent(*args, **kwargs) self.this = newobj.this self.thisown = 1 diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp index c234f6e9c5..56a16ce8f6 100644 --- a/wxPython/src/gtk/_windows_wrap.cpp +++ b/wxPython/src/gtk/_windows_wrap.cpp @@ -217,50 +217,50 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxEvent swig_types[6] #define SWIGTYPE_p_wxPrintData swig_types[7] #define SWIGTYPE_p_wxTaskBarIcon swig_types[8] -#define SWIGTYPE_p_wxIconBundle swig_types[9] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[10] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[11] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[12] -#define SWIGTYPE_p_wxFont swig_types[13] -#define SWIGTYPE_p_wxSplitterEvent swig_types[14] -#define SWIGTYPE_p_wxRegion swig_types[15] -#define SWIGTYPE_p_wxFindReplaceData swig_types[16] -#define SWIGTYPE_p_int swig_types[17] -#define SWIGTYPE_p_wxSize swig_types[18] -#define SWIGTYPE_p_wxDC swig_types[19] -#define SWIGTYPE_p_wxIcon swig_types[20] -#define SWIGTYPE_p_wxVisualAttributes swig_types[21] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[22] -#define SWIGTYPE_p_wxColourData swig_types[23] -#define SWIGTYPE_p_wxNotifyEvent swig_types[24] -#define SWIGTYPE_p_wxPyWindow swig_types[25] -#define SWIGTYPE_p_wxSplashScreen swig_types[26] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[27] -#define SWIGTYPE_p_wxProgressDialog swig_types[28] -#define SWIGTYPE_p_wxMessageDialog swig_types[29] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[30] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[31] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[32] -#define SWIGTYPE_p_wxFileDialog swig_types[33] -#define SWIGTYPE_p_wxPrinter swig_types[34] -#define SWIGTYPE_p_wxArrayInt swig_types[35] -#define SWIGTYPE_p_wxEvtHandler swig_types[36] -#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[37] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[38] -#define SWIGTYPE_p_wxPyVListBox swig_types[39] -#define SWIGTYPE_p_wxRect swig_types[40] -#define SWIGTYPE_p_char swig_types[41] -#define SWIGTYPE_p_wxMiniFrame swig_types[42] -#define SWIGTYPE_p_wxFrame swig_types[43] -#define SWIGTYPE_p_wxPyPrintout swig_types[44] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[45] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[46] -#define SWIGTYPE_p_wxStatusBar swig_types[47] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[48] -#define SWIGTYPE_p_wxPoint swig_types[49] -#define SWIGTYPE_p_wxObject swig_types[50] -#define SWIGTYPE_p_wxOutputStream swig_types[51] -#define SWIGTYPE_p_wxPyScrolledWindow swig_types[52] +#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[9] +#define SWIGTYPE_p_wxIconBundle swig_types[10] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[11] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[12] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[13] +#define SWIGTYPE_p_wxFont swig_types[14] +#define SWIGTYPE_p_wxSplitterEvent swig_types[15] +#define SWIGTYPE_p_wxRegion swig_types[16] +#define SWIGTYPE_p_wxFindReplaceData swig_types[17] +#define SWIGTYPE_p_int swig_types[18] +#define SWIGTYPE_p_wxSize swig_types[19] +#define SWIGTYPE_p_wxDC swig_types[20] +#define SWIGTYPE_p_wxIcon swig_types[21] +#define SWIGTYPE_p_wxVisualAttributes swig_types[22] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[23] +#define SWIGTYPE_p_wxColourData swig_types[24] +#define SWIGTYPE_p_wxNotifyEvent swig_types[25] +#define SWIGTYPE_p_wxPyWindow swig_types[26] +#define SWIGTYPE_p_wxSplashScreen swig_types[27] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[28] +#define SWIGTYPE_p_wxProgressDialog swig_types[29] +#define SWIGTYPE_p_wxMessageDialog swig_types[30] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[31] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[32] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[33] +#define SWIGTYPE_p_wxFileDialog swig_types[34] +#define SWIGTYPE_p_wxPrinter swig_types[35] +#define SWIGTYPE_p_wxArrayInt swig_types[36] +#define SWIGTYPE_p_wxEvtHandler swig_types[37] +#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[38] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[39] +#define SWIGTYPE_p_wxPyVListBox swig_types[40] +#define SWIGTYPE_p_wxRect swig_types[41] +#define SWIGTYPE_p_char swig_types[42] +#define SWIGTYPE_p_wxMiniFrame swig_types[43] +#define SWIGTYPE_p_wxFrame swig_types[44] +#define SWIGTYPE_p_wxPyPrintout swig_types[45] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[46] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[47] +#define SWIGTYPE_p_wxStatusBar swig_types[48] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[49] +#define SWIGTYPE_p_wxPoint swig_types[50] +#define SWIGTYPE_p_wxObject swig_types[51] +#define SWIGTYPE_p_wxOutputStream swig_types[52] #define SWIGTYPE_p_wxMDIClientWindow swig_types[53] #define SWIGTYPE_p_wxTipWindow swig_types[54] #define SWIGTYPE_p_wxSashLayoutWindow swig_types[55] @@ -274,27 +274,28 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxWindow swig_types[63] #define SWIGTYPE_p_wxScrolledWindow swig_types[64] #define SWIGTYPE_p_wxMenuBar swig_types[65] -#define SWIGTYPE_p_wxPrintPreview swig_types[66] -#define SWIGTYPE_p_wxSashEvent swig_types[67] -#define SWIGTYPE_p_wxString swig_types[68] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[69] -#define SWIGTYPE_p_wxFontDialog swig_types[70] -#define SWIGTYPE_p_wxDirDialog swig_types[71] -#define SWIGTYPE_p_wxColourDialog swig_types[72] -#define SWIGTYPE_p_wxDialog swig_types[73] -#define SWIGTYPE_p_wxPanel swig_types[74] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[75] -#define SWIGTYPE_p_wxPrintDialog swig_types[76] -#define SWIGTYPE_p_wxFileSystem swig_types[77] -#define SWIGTYPE_p_wxBitmap swig_types[78] -#define SWIGTYPE_p_wxCommandEvent swig_types[79] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[80] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[81] -#define SWIGTYPE_p_wxColour swig_types[82] -#define SWIGTYPE_p_wxToolBar swig_types[83] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[84] -#define SWIGTYPE_p_wxPrintDialogData swig_types[85] -static swig_type_info *swig_types[87]; +#define SWIGTYPE_p_wxPyScrolledWindow swig_types[66] +#define SWIGTYPE_p_wxPrintPreview swig_types[67] +#define SWIGTYPE_p_wxSashEvent swig_types[68] +#define SWIGTYPE_p_wxString swig_types[69] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[70] +#define SWIGTYPE_p_wxFontDialog swig_types[71] +#define SWIGTYPE_p_wxDirDialog swig_types[72] +#define SWIGTYPE_p_wxColourDialog swig_types[73] +#define SWIGTYPE_p_wxDialog swig_types[74] +#define SWIGTYPE_p_wxPanel swig_types[75] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[76] +#define SWIGTYPE_p_wxPrintDialog swig_types[77] +#define SWIGTYPE_p_wxFileSystem swig_types[78] +#define SWIGTYPE_p_wxBitmap swig_types[79] +#define SWIGTYPE_p_wxCommandEvent swig_types[80] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[81] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[82] +#define SWIGTYPE_p_wxColour swig_types[83] +#define SWIGTYPE_p_wxToolBar swig_types[84] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[85] +#define SWIGTYPE_p_wxPrintDialogData swig_types[86] +static swig_type_info *swig_types[88]; /* -------- TYPES TABLE (END) -------- */ @@ -953,45 +954,44 @@ enum { #else -// // Otherwise make a class that can virtualize CreatePopupMenu -// class wxPyTaskBarIcon : public wxTaskBarIcon -// { -// DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon); -// public: -// wxPyTaskBarIcon() : wxTaskBarIcon() -// {} - -// wxMenu* CreatePopupMenu() { -// wxMenu *rval = NULL; -// bool found; -// bool blocked = wxPyBeginBlockThreads(); -// if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { -// PyObject* ro; -// wxMenu* ptr; -// ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); -// if (ro) { -// if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxMenu"))) -// rval = ptr; -// Py_DECREF(ro); -// } -// } -// wxPyEndBlockThreads(blocked); -// if (! found) -// rval = wxTaskBarIcon::CreatePopupMenu(); -// return rval; -// } - -// PYPRIVATE; -// }; - -// IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon); +// Otherwise make a class that can virtualize CreatePopupMenu +class wxPyTaskBarIcon : public wxTaskBarIcon +{ + DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon); +public: + wxPyTaskBarIcon() : wxTaskBarIcon() + {} + + wxMenu* CreatePopupMenu() { + wxMenu *rval = NULL; + bool found; + bool blocked = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { + PyObject* ro; + wxMenu* ptr; + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); + if (ro) { + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxMenu"))) + rval = ptr; + Py_DECREF(ro); + } + } + wxPyEndBlockThreads(blocked); + if (! found) + rval = wxTaskBarIcon::CreatePopupMenu(); + return rval; + } + + PYPRIVATE; +}; + +IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon); #endif -void wxTaskBarIcon_Destroy(wxTaskBarIcon *self){ - +void wxPyTaskBarIcon_Destroy(wxPyTaskBarIcon *self){ self->RemoveIcon(); - + delete self; } static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); @@ -11101,7 +11101,7 @@ static PyObject * HtmlListBox_swigregister(PyObject *, PyObject *args) { } static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *result; + wxPyTaskBarIcon *result; char *kwnames[] = { NULL }; @@ -11110,32 +11110,42 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwa { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTaskBarIcon *)new wxTaskBarIcon(); + result = (wxPyTaskBarIcon *)new wxPyTaskBarIcon(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTaskBarIcon, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTaskBarIcon, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + int arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TaskBarIcon",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TaskBarIcon__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = obj1; + arg3 = obj2; + arg4 = (int)SWIG_As_int(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; + (arg1)->_setCallbackInfo(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11149,18 +11159,18 @@ static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_Destroy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxTaskBarIcon_Destroy(arg1); + wxPyTaskBarIcon_Destroy(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11174,7 +11184,7 @@ static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *, PyObject *args, PyObject static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11182,11 +11192,11 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_IsOk",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTaskBarIcon const *)arg1)->IsOk(); + result = (bool)((wxPyTaskBarIcon const *)arg1)->IsOk(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11202,7 +11212,7 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kw static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11210,11 +11220,11 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_IsIconInstalled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTaskBarIcon const *)arg1)->IsIconInstalled(); + result = (bool)((wxPyTaskBarIcon const *)arg1)->IsIconInstalled(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11230,7 +11240,7 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, P static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; wxIcon *arg2 = 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; @@ -11244,7 +11254,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TaskBarIcon_SetIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) @@ -11286,7 +11296,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11294,7 +11304,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_RemoveIcon",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11314,7 +11324,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObje static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; wxMenu *arg2 = (wxMenu *) 0 ; bool result; PyObject * obj0 = 0 ; @@ -11324,7 +11334,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TaskBarIcon_PopupMenu",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -11347,7 +11357,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObjec static PyObject * TaskBarIcon_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxTaskBarIcon, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxPyTaskBarIcon, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -25484,7 +25494,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL }, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_IsIconInstalled", (PyCFunction) _wrap_TaskBarIcon_IsIconInstalled, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -26175,8 +26185,8 @@ static void *_p_wxPreviewControlBarTo_p_wxEvtHandler(void *x) { static void *_p_wxPyPreviewControlBarTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } -static void *_p_wxTaskBarIconTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxTaskBarIcon *) x)); +static void *_p_wxPyTaskBarIconTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyTaskBarIcon *) x)); } static void *_p_wxFrameTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxFrame *) x)); @@ -26289,8 +26299,8 @@ static void *_p_wxInitDialogEventTo_p_wxObject(void *x) { static void *_p_wxLayoutAlgorithmTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutAlgorithm *) x)); } -static void *_p_wxTaskBarIconTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxEvtHandler *) ((wxTaskBarIcon *) x)); +static void *_p_wxPyTaskBarIconTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *) ((wxPyTaskBarIcon *) x)); } static void *_p_wxFindDialogEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxFindDialogEvent *) x)); @@ -26946,6 +26956,7 @@ static swig_type_info _swigt__p_wxFontData[] = {{"_p_wxFontData", 0, "wxFontData static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEvent", 0, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0, 0, 0, 0},{"_p_wxPrintData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTaskBarIcon[] = {{"_p_wxTaskBarIcon", 0, "wxTaskBarIcon *", 0, 0, 0, 0},{"_p_wxTaskBarIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyTaskBarIcon[] = {{"_p_wxPyTaskBarIcon", 0, "wxPyTaskBarIcon *", 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxIconBundle[] = {{"_p_wxIconBundle", 0, "wxIconBundle *", 0, 0, 0, 0},{"_p_wxIconBundle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLayoutAlgorithm[] = {{"_p_wxLayoutAlgorithm", 0, "wxLayoutAlgorithm *", 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFindDialogEvent[] = {{"_p_wxFindDialogEvent", 0, "wxFindDialogEvent *", 0, 0, 0, 0},{"_p_wxFindDialogEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -26973,7 +26984,7 @@ static swig_type_info _swigt__p_wxMultiChoiceDialog[] = {{"_p_wxMultiChoiceDialo static swig_type_info _swigt__p_wxFileDialog[] = {{"_p_wxFileDialog", 0, "wxFileDialog *", 0, 0, 0, 0},{"_p_wxFileDialog", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrinter[] = {{"_p_wxPrinter", 0, "wxPrinter *", 0, 0, 0, 0},{"_p_wxPrinter", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxArrayInt[] = {{"_p_wxArrayInt", 0, "wxArrayInt *", 0, 0, 0, 0},{"_p_wxArrayInt", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCalculateLayoutEvent[] = {{"_p_wxCalculateLayoutEvent", 0, "wxCalculateLayoutEvent *", 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyHtmlListBox[] = {{"_p_wxPyHtmlListBox", 0, "wxPyHtmlListBox *", 0, 0, 0, 0},{"_p_wxPyHtmlListBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyVListBox[] = {{"_p_wxPyVListBox", 0, "wxPyVListBox *", 0, 0, 0, 0},{"_p_wxPyVListBox", 0, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVListBox, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -26987,9 +26998,8 @@ static swig_type_info _swigt__p_wxScrollWinEvent[] = {{"_p_wxScrollWinEvent", 0, static swig_type_info _swigt__p_wxStatusBar[] = {{"_p_wxStatusBar", 0, "wxStatusBar *", 0, 0, 0, 0},{"_p_wxStatusBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMDIParentFrame[] = {{"_p_wxMDIParentFrame", 0, "wxMDIParentFrame *", 0, 0, 0, 0},{"_p_wxMDIParentFrame", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0, 0, 0, 0},{"_p_wxOutputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPyScrolledWindow[] = {{"_p_wxPyScrolledWindow", 0, "wxPyScrolledWindow *", 0, 0, 0, 0},{"_p_wxPyScrolledWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow", 0, "wxMDIClientWindow *", 0, 0, 0, 0},{"_p_wxMDIClientWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTipWindow[] = {{"_p_wxTipWindow", 0, "wxTipWindow *", 0, 0, 0, 0},{"_p_wxTipWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSashLayoutWindow[] = {{"_p_wxSashLayoutWindow", 0, "wxSashLayoutWindow *", 0, 0, 0, 0},{"_p_wxSashLayoutWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -27003,6 +27013,7 @@ static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0, 0, 0, 0},{"_p_wxMenuBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyScrolledWindow[] = {{"_p_wxPyScrolledWindow", 0, "wxPyScrolledWindow *", 0, 0, 0, 0},{"_p_wxPyScrolledWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintPreview[] = {{"_p_wxPrintPreview", 0, "wxPrintPreview *", 0, 0, 0, 0},{"_p_wxPrintPreview", 0, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxPrintPreview, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSashEvent[] = {{"_p_wxSashEvent", 0, "wxSashEvent *", 0, 0, 0, 0},{"_p_wxSashEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -27034,6 +27045,7 @@ _swigt__p_wxFontData, _swigt__p_wxEvent, _swigt__p_wxPrintData, _swigt__p_wxTaskBarIcon, +_swigt__p_wxPyTaskBarIcon, _swigt__p_wxIconBundle, _swigt__p_wxLayoutAlgorithm, _swigt__p_wxFindDialogEvent, @@ -27077,7 +27089,6 @@ _swigt__p_wxMDIParentFrame, _swigt__p_wxPoint, _swigt__p_wxObject, _swigt__p_wxOutputStream, -_swigt__p_wxPyScrolledWindow, _swigt__p_wxMDIClientWindow, _swigt__p_wxTipWindow, _swigt__p_wxSashLayoutWindow, @@ -27091,6 +27102,7 @@ _swigt__p_wxTopLevelWindow, _swigt__p_wxWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxMenuBar, +_swigt__p_wxPyScrolledWindow, _swigt__p_wxPrintPreview, _swigt__p_wxSashEvent, _swigt__p_wxString, diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 74f854c8c8..3317097c9b 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -1628,6 +1628,14 @@ class Font(GDIObject): """GetPointSize(self) -> int""" return _gdi_.Font_GetPointSize(*args, **kwargs) + def GetPixelSize(*args, **kwargs): + """GetPixelSize(self) -> Size""" + return _gdi_.Font_GetPixelSize(*args, **kwargs) + + def IsUsingSizeInPixels(*args, **kwargs): + """IsUsingSizeInPixels(self) -> bool""" + return _gdi_.Font_IsUsingSizeInPixels(*args, **kwargs) + def GetFamily(*args, **kwargs): """GetFamily(self) -> int""" return _gdi_.Font_GetFamily(*args, **kwargs) @@ -1672,6 +1680,10 @@ class Font(GDIObject): """SetPointSize(self, int pointSize)""" return _gdi_.Font_SetPointSize(*args, **kwargs) + def SetPixelSize(*args, **kwargs): + """SetPixelSize(self, Size pixelSize)""" + return _gdi_.Font_SetPixelSize(*args, **kwargs) + def SetFamily(*args, **kwargs): """SetFamily(self, int family)""" return _gdi_.Font_SetFamily(*args, **kwargs) @@ -1770,6 +1782,17 @@ def Font2(*args, **kwargs): val.thisown = 1 return val +def FontFromPixelSize(*args, **kwargs): + """ + FontFromPixelSize(Size pixelSize, int family, int style, int weight, + bool underlined=False, String face=wxEmptyString, + int encoding=FONTENCODING_DEFAULT) -> Font + """ + if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName'] + val = _gdi_.new_FontFromPixelSize(*args, **kwargs) + val.thisown = 1 + return val + def Font_GetDefaultEncoding(*args, **kwargs): """Font_GetDefaultEncoding() -> int""" return _gdi_.Font_GetDefaultEncoding(*args, **kwargs) diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index f6960125de..0369d25b4e 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -890,6 +890,11 @@ wxFont *new_wxFont(wxString const &info){ wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags,wxString const &face,wxFontEncoding encoding){ return wxFont::New(pointSize, family, flags, face, encoding); } +wxFont *new_wxFont(wxSize const &pixelSize,int family,int style,int weight,bool underlined,wxString const &face,wxFontEncoding encoding){ + return wxFontBase::New(pixelSize, family, + style, weight, underlined, + face, encoding); + } bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : false; } bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : true; } @@ -7900,6 +7905,79 @@ static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_new_FontFromPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSize *arg1 = 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + bool arg5 = (bool) false ; + wxString const &arg6_defvalue = wxEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + int arg7 = (int) wxFONTENCODING_DEFAULT ; + wxFont *result; + wxSize temp1 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "pixelSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underlined",(char *) "face",(char *) "encoding", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_FontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = &temp1; + if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; + } + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int)SWIG_As_int(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int)SWIG_As_int(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (bool)SWIG_As_bool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + if (obj6) { + arg7 = (int)SWIG_As_int(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxFont *)new_wxFont((wxSize const &)*arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,(wxFontEncoding )arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + static PyObject *_wrap_Font_Ok(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -8018,6 +8096,64 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_Font_GetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetPixelSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxFont const *)arg1)->GetPixelSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Font_IsUsingSizeInPixels(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_IsUsingSizeInPixels",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxFont const *)arg1)->IsUsingSizeInPixels(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Font_GetFamily(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -8329,6 +8465,38 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_Font_SetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pixelSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPixelSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPixelSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Font_SetFamily(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -18704,10 +18872,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_FontFromNativeInfo", (PyCFunction) _wrap_new_FontFromNativeInfo, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_FontFromNativeInfoString", (PyCFunction) _wrap_new_FontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_Font2", (PyCFunction) _wrap_new_Font2, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"new_FontFromPixelSize", (PyCFunction) _wrap_new_FontFromPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_Ok", (PyCFunction) _wrap_Font_Ok, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font___eq__", (PyCFunction) _wrap_Font___eq__, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font___ne__", (PyCFunction) _wrap_Font___ne__, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetPointSize", (PyCFunction) _wrap_Font_GetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_GetPixelSize", (PyCFunction) _wrap_Font_GetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_IsUsingSizeInPixels", (PyCFunction) _wrap_Font_IsUsingSizeInPixels, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetFamily", (PyCFunction) _wrap_Font_GetFamily, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetStyle", (PyCFunction) _wrap_Font_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetWeight", (PyCFunction) _wrap_Font_GetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -18719,6 +18890,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Font_GetNativeFontInfoDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoDesc, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetNativeFontInfoUserDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetPointSize", (PyCFunction) _wrap_Font_SetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_SetPixelSize", (PyCFunction) _wrap_Font_SetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetFamily", (PyCFunction) _wrap_Font_SetFamily, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetStyle", (PyCFunction) _wrap_Font_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetWeight", (PyCFunction) _wrap_Font_SetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index ad1e9542cd..fad81975bc 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -376,6 +376,10 @@ class TopLevelWindow(_core.Window): """RequestUserAttention(self, int flags=USER_ATTENTION_INFO)""" return _windows_.TopLevelWindow_RequestUserAttention(*args, **kwargs) + def IsActive(*args, **kwargs): + """IsActive(self) -> bool""" + return _windows_.TopLevelWindow_IsActive(*args, **kwargs) + def MacSetMetalAppearance(*args, **kwargs): """MacSetMetalAppearance(self, bool on)""" return _windows_.TopLevelWindow_MacSetMetalAppearance(*args, **kwargs) @@ -2031,18 +2035,18 @@ def PreHtmlListBox(*args, **kwargs): class TaskBarIcon(_core.EvtHandler): def __repr__(self): - return "<%s.%s; proxy of C++ wxTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + return "<%s.%s; proxy of C++ wxPyTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """__init__(self) -> TaskBarIcon""" newobj = _windows_.new_TaskBarIcon(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown - def __del__(self, destroy=_windows_.delete_TaskBarIcon): - """__del__(self)""" - try: - if self.thisown: destroy(self) - except: pass + self._setCallbackInfo(self, TaskBarIcon, 0) + + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)""" + return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs) def Destroy(*args, **kwargs): """ @@ -2085,7 +2089,7 @@ class TaskBarIconEvent(_core.Event): def __repr__(self): return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, wxEventType evtType, TaskBarIcon tbIcon) -> TaskBarIconEvent""" + """__init__(self, wxEventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent""" newobj = _windows_.new_TaskBarIconEvent(*args, **kwargs) self.this = newobj.this self.thisown = 1 diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index 8a6e291f38..6a517ec1af 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -217,50 +217,50 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxEvent swig_types[6] #define SWIGTYPE_p_wxPrintData swig_types[7] #define SWIGTYPE_p_wxTaskBarIcon swig_types[8] -#define SWIGTYPE_p_wxIconBundle swig_types[9] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[10] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[11] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[12] -#define SWIGTYPE_p_wxFont swig_types[13] -#define SWIGTYPE_p_wxSplitterEvent swig_types[14] -#define SWIGTYPE_p_wxRegion swig_types[15] -#define SWIGTYPE_p_wxFindReplaceData swig_types[16] -#define SWIGTYPE_p_int swig_types[17] -#define SWIGTYPE_p_wxSize swig_types[18] -#define SWIGTYPE_p_wxDC swig_types[19] -#define SWIGTYPE_p_wxIcon swig_types[20] -#define SWIGTYPE_p_wxVisualAttributes swig_types[21] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[22] -#define SWIGTYPE_p_wxColourData swig_types[23] -#define SWIGTYPE_p_wxNotifyEvent swig_types[24] -#define SWIGTYPE_p_wxPyWindow swig_types[25] -#define SWIGTYPE_p_wxSplashScreen swig_types[26] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[27] -#define SWIGTYPE_p_wxProgressDialog swig_types[28] -#define SWIGTYPE_p_wxMessageDialog swig_types[29] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[30] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[31] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[32] -#define SWIGTYPE_p_wxFileDialog swig_types[33] -#define SWIGTYPE_p_wxPrinter swig_types[34] -#define SWIGTYPE_p_wxArrayInt swig_types[35] -#define SWIGTYPE_p_wxEvtHandler swig_types[36] -#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[37] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[38] -#define SWIGTYPE_p_wxPyVListBox swig_types[39] -#define SWIGTYPE_p_wxRect swig_types[40] -#define SWIGTYPE_p_char swig_types[41] -#define SWIGTYPE_p_wxMiniFrame swig_types[42] -#define SWIGTYPE_p_wxFrame swig_types[43] -#define SWIGTYPE_p_wxPyPrintout swig_types[44] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[45] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[46] -#define SWIGTYPE_p_wxStatusBar swig_types[47] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[48] -#define SWIGTYPE_p_wxPoint swig_types[49] -#define SWIGTYPE_p_wxObject swig_types[50] -#define SWIGTYPE_p_wxOutputStream swig_types[51] -#define SWIGTYPE_p_wxPyScrolledWindow swig_types[52] +#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[9] +#define SWIGTYPE_p_wxIconBundle swig_types[10] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[11] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[12] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[13] +#define SWIGTYPE_p_wxFont swig_types[14] +#define SWIGTYPE_p_wxSplitterEvent swig_types[15] +#define SWIGTYPE_p_wxRegion swig_types[16] +#define SWIGTYPE_p_wxFindReplaceData swig_types[17] +#define SWIGTYPE_p_int swig_types[18] +#define SWIGTYPE_p_wxSize swig_types[19] +#define SWIGTYPE_p_wxDC swig_types[20] +#define SWIGTYPE_p_wxIcon swig_types[21] +#define SWIGTYPE_p_wxVisualAttributes swig_types[22] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[23] +#define SWIGTYPE_p_wxColourData swig_types[24] +#define SWIGTYPE_p_wxNotifyEvent swig_types[25] +#define SWIGTYPE_p_wxPyWindow swig_types[26] +#define SWIGTYPE_p_wxSplashScreen swig_types[27] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[28] +#define SWIGTYPE_p_wxProgressDialog swig_types[29] +#define SWIGTYPE_p_wxMessageDialog swig_types[30] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[31] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[32] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[33] +#define SWIGTYPE_p_wxFileDialog swig_types[34] +#define SWIGTYPE_p_wxPrinter swig_types[35] +#define SWIGTYPE_p_wxArrayInt swig_types[36] +#define SWIGTYPE_p_wxEvtHandler swig_types[37] +#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[38] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[39] +#define SWIGTYPE_p_wxPyVListBox swig_types[40] +#define SWIGTYPE_p_wxRect swig_types[41] +#define SWIGTYPE_p_char swig_types[42] +#define SWIGTYPE_p_wxMiniFrame swig_types[43] +#define SWIGTYPE_p_wxFrame swig_types[44] +#define SWIGTYPE_p_wxPyPrintout swig_types[45] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[46] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[47] +#define SWIGTYPE_p_wxStatusBar swig_types[48] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[49] +#define SWIGTYPE_p_wxPoint swig_types[50] +#define SWIGTYPE_p_wxObject swig_types[51] +#define SWIGTYPE_p_wxOutputStream swig_types[52] #define SWIGTYPE_p_wxMDIClientWindow swig_types[53] #define SWIGTYPE_p_wxTipWindow swig_types[54] #define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[55] @@ -274,27 +274,28 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxWindow swig_types[63] #define SWIGTYPE_p_wxScrolledWindow swig_types[64] #define SWIGTYPE_p_wxMenuBar swig_types[65] -#define SWIGTYPE_p_wxPrintPreview swig_types[66] -#define SWIGTYPE_p_wxSashEvent swig_types[67] -#define SWIGTYPE_p_wxString swig_types[68] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[69] -#define SWIGTYPE_p_wxFontDialog swig_types[70] -#define SWIGTYPE_p_wxDirDialog swig_types[71] -#define SWIGTYPE_p_wxColourDialog swig_types[72] -#define SWIGTYPE_p_wxDialog swig_types[73] -#define SWIGTYPE_p_wxPanel swig_types[74] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[75] -#define SWIGTYPE_p_wxPrintDialog swig_types[76] -#define SWIGTYPE_p_wxFileSystem swig_types[77] -#define SWIGTYPE_p_wxBitmap swig_types[78] -#define SWIGTYPE_p_wxCommandEvent swig_types[79] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[80] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[81] -#define SWIGTYPE_p_wxColour swig_types[82] -#define SWIGTYPE_p_wxToolBar swig_types[83] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[84] -#define SWIGTYPE_p_wxPrintDialogData swig_types[85] -static swig_type_info *swig_types[87]; +#define SWIGTYPE_p_wxPyScrolledWindow swig_types[66] +#define SWIGTYPE_p_wxPrintPreview swig_types[67] +#define SWIGTYPE_p_wxSashEvent swig_types[68] +#define SWIGTYPE_p_wxString swig_types[69] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[70] +#define SWIGTYPE_p_wxFontDialog swig_types[71] +#define SWIGTYPE_p_wxDirDialog swig_types[72] +#define SWIGTYPE_p_wxColourDialog swig_types[73] +#define SWIGTYPE_p_wxDialog swig_types[74] +#define SWIGTYPE_p_wxPanel swig_types[75] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[76] +#define SWIGTYPE_p_wxPrintDialog swig_types[77] +#define SWIGTYPE_p_wxFileSystem swig_types[78] +#define SWIGTYPE_p_wxBitmap swig_types[79] +#define SWIGTYPE_p_wxCommandEvent swig_types[80] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[81] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[82] +#define SWIGTYPE_p_wxColour swig_types[83] +#define SWIGTYPE_p_wxToolBar swig_types[84] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[85] +#define SWIGTYPE_p_wxPrintDialogData swig_types[86] +static swig_type_info *swig_types[88]; /* -------- TYPES TABLE (END) -------- */ @@ -948,45 +949,44 @@ enum { #else -// // Otherwise make a class that can virtualize CreatePopupMenu -// class wxPyTaskBarIcon : public wxTaskBarIcon -// { -// DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon); -// public: -// wxPyTaskBarIcon() : wxTaskBarIcon() -// {} - -// wxMenu* CreatePopupMenu() { -// wxMenu *rval = NULL; -// bool found; -// bool blocked = wxPyBeginBlockThreads(); -// if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { -// PyObject* ro; -// wxMenu* ptr; -// ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); -// if (ro) { -// if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxMenu"))) -// rval = ptr; -// Py_DECREF(ro); -// } -// } -// wxPyEndBlockThreads(blocked); -// if (! found) -// rval = wxTaskBarIcon::CreatePopupMenu(); -// return rval; -// } - -// PYPRIVATE; -// }; - -// IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon); +// Otherwise make a class that can virtualize CreatePopupMenu +class wxPyTaskBarIcon : public wxTaskBarIcon +{ + DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon); +public: + wxPyTaskBarIcon() : wxTaskBarIcon() + {} -#endif + wxMenu* CreatePopupMenu() { + wxMenu *rval = NULL; + bool found; + bool blocked = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { + PyObject* ro; + wxMenu* ptr; + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); + if (ro) { + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxMenu"))) + rval = ptr; + Py_DECREF(ro); + } + } + wxPyEndBlockThreads(blocked); + if (! found) + rval = wxTaskBarIcon::CreatePopupMenu(); + return rval; + } -void wxTaskBarIcon_Destroy(wxTaskBarIcon *self){ - + PYPRIVATE; +}; +IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon); +#endif + +void wxPyTaskBarIcon_Destroy(wxPyTaskBarIcon *self){ + self->RemoveIcon(); + delete self; } static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); @@ -3303,6 +3303,34 @@ static PyObject *_wrap_TopLevelWindow_RequestUserAttention(PyObject *, PyObject } +static PyObject *_wrap_TopLevelWindow_IsActive(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TopLevelWindow_IsActive",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTopLevelWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->IsActive(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TopLevelWindow_MacSetMetalAppearance(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ; @@ -11019,7 +11047,7 @@ static PyObject * HtmlListBox_swigregister(PyObject *, PyObject *args) { } static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *result; + wxPyTaskBarIcon *result; char *kwnames[] = { NULL }; @@ -11028,32 +11056,42 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwa { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTaskBarIcon *)new wxTaskBarIcon(); + result = (wxPyTaskBarIcon *)new wxPyTaskBarIcon(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTaskBarIcon, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTaskBarIcon, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + int arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TaskBarIcon",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TaskBarIcon__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = obj1; + arg3 = obj2; + arg4 = (int)SWIG_As_int(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; + (arg1)->_setCallbackInfo(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11067,18 +11105,18 @@ static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_Destroy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxTaskBarIcon_Destroy(arg1); + wxPyTaskBarIcon_Destroy(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11092,7 +11130,7 @@ static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *, PyObject *args, PyObject static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11100,11 +11138,11 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_IsOk",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTaskBarIcon const *)arg1)->IsOk(); + result = (bool)((wxPyTaskBarIcon const *)arg1)->IsOk(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11120,7 +11158,7 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kw static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11128,11 +11166,11 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_IsIconInstalled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTaskBarIcon const *)arg1)->IsIconInstalled(); + result = (bool)((wxPyTaskBarIcon const *)arg1)->IsIconInstalled(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11148,7 +11186,7 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, P static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; wxIcon *arg2 = 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; @@ -11162,7 +11200,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TaskBarIcon_SetIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) @@ -11204,7 +11242,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11212,7 +11250,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_RemoveIcon",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11232,7 +11270,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObje static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; wxMenu *arg2 = (wxMenu *) 0 ; bool result; PyObject * obj0 = 0 ; @@ -11242,7 +11280,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TaskBarIcon_PopupMenu",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -11265,7 +11303,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObjec static PyObject * TaskBarIcon_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxTaskBarIcon, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxPyTaskBarIcon, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -25169,6 +25207,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TopLevelWindow_GetTitle", (PyCFunction) _wrap_TopLevelWindow_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_SetShape", (PyCFunction) _wrap_TopLevelWindow_SetShape, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_RequestUserAttention", (PyCFunction) _wrap_TopLevelWindow_RequestUserAttention, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"TopLevelWindow_IsActive", (PyCFunction) _wrap_TopLevelWindow_IsActive, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_MacSetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacSetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_MacGetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacGetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_swigregister", TopLevelWindow_swigregister, METH_VARARGS, NULL }, @@ -25400,7 +25439,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL }, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_IsIconInstalled", (PyCFunction) _wrap_TaskBarIcon_IsIconInstalled, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -26091,8 +26130,8 @@ static void *_p_wxPreviewControlBarTo_p_wxEvtHandler(void *x) { static void *_p_wxPyPreviewControlBarTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } -static void *_p_wxTaskBarIconTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxTaskBarIcon *) x)); +static void *_p_wxPyTaskBarIconTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyTaskBarIcon *) x)); } static void *_p_wxFrameTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxFrame *) x)); @@ -26208,8 +26247,8 @@ static void *_p_wxInitDialogEventTo_p_wxObject(void *x) { static void *_p_wxLayoutAlgorithmTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutAlgorithm *) x)); } -static void *_p_wxTaskBarIconTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxEvtHandler *) ((wxTaskBarIcon *) x)); +static void *_p_wxPyTaskBarIconTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *) ((wxPyTaskBarIcon *) x)); } static void *_p_wxFindDialogEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxFindDialogEvent *) x)); @@ -26862,6 +26901,7 @@ static swig_type_info _swigt__p_wxFontData[] = {{"_p_wxFontData", 0, "wxFontData static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEvent", 0, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0, 0, 0, 0},{"_p_wxPrintData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTaskBarIcon[] = {{"_p_wxTaskBarIcon", 0, "wxTaskBarIcon *", 0, 0, 0, 0},{"_p_wxTaskBarIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyTaskBarIcon[] = {{"_p_wxPyTaskBarIcon", 0, "wxPyTaskBarIcon *", 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxIconBundle[] = {{"_p_wxIconBundle", 0, "wxIconBundle *", 0, 0, 0, 0},{"_p_wxIconBundle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLayoutAlgorithm[] = {{"_p_wxLayoutAlgorithm", 0, "wxLayoutAlgorithm *", 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFindDialogEvent[] = {{"_p_wxFindDialogEvent", 0, "wxFindDialogEvent *", 0, 0, 0, 0},{"_p_wxFindDialogEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -26889,7 +26929,7 @@ static swig_type_info _swigt__p_wxMultiChoiceDialog[] = {{"_p_wxMultiChoiceDialo static swig_type_info _swigt__p_wxFileDialog[] = {{"_p_wxFileDialog", 0, "wxFileDialog *", 0, 0, 0, 0},{"_p_wxFileDialog", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrinter[] = {{"_p_wxPrinter", 0, "wxPrinter *", 0, 0, 0, 0},{"_p_wxPrinter", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxArrayInt[] = {{"_p_wxArrayInt", 0, "wxArrayInt *", 0, 0, 0, 0},{"_p_wxArrayInt", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCalculateLayoutEvent[] = {{"_p_wxCalculateLayoutEvent", 0, "wxCalculateLayoutEvent *", 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyHtmlListBox[] = {{"_p_wxPyHtmlListBox", 0, "wxPyHtmlListBox *", 0, 0, 0, 0},{"_p_wxPyHtmlListBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyVListBox[] = {{"_p_wxPyVListBox", 0, "wxPyVListBox *", 0, 0, 0, 0},{"_p_wxPyVListBox", 0, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVListBox, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -26903,9 +26943,8 @@ static swig_type_info _swigt__p_wxScrollWinEvent[] = {{"_p_wxScrollWinEvent", 0, static swig_type_info _swigt__p_wxStatusBar[] = {{"_p_wxStatusBar", 0, "wxStatusBar *", 0, 0, 0, 0},{"_p_wxStatusBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMDIParentFrame[] = {{"_p_wxMDIParentFrame", 0, "wxMDIParentFrame *", 0, 0, 0, 0},{"_p_wxMDIParentFrame", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0, 0, 0, 0},{"_p_wxOutputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPyScrolledWindow[] = {{"_p_wxPyScrolledWindow", 0, "wxPyScrolledWindow *", 0, 0, 0, 0},{"_p_wxPyScrolledWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow", 0, "wxMDIClientWindow *", 0, 0, 0, 0},{"_p_wxMDIClientWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTipWindow[] = {{"_p_wxTipWindow", 0, "wxTipWindow *", 0, 0, 0, 0},{"_p_wxTipWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyPopupTransientWindow[] = {{"_p_wxPyPopupTransientWindow", 0, "wxPyPopupTransientWindow *", 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -26919,6 +26958,7 @@ static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0, 0, 0, 0},{"_p_wxMenuBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyScrolledWindow[] = {{"_p_wxPyScrolledWindow", 0, "wxPyScrolledWindow *", 0, 0, 0, 0},{"_p_wxPyScrolledWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintPreview[] = {{"_p_wxPrintPreview", 0, "wxPrintPreview *", 0, 0, 0, 0},{"_p_wxPrintPreview", 0, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxPrintPreview, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSashEvent[] = {{"_p_wxSashEvent", 0, "wxSashEvent *", 0, 0, 0, 0},{"_p_wxSashEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -26950,6 +26990,7 @@ _swigt__p_wxFontData, _swigt__p_wxEvent, _swigt__p_wxPrintData, _swigt__p_wxTaskBarIcon, +_swigt__p_wxPyTaskBarIcon, _swigt__p_wxIconBundle, _swigt__p_wxLayoutAlgorithm, _swigt__p_wxFindDialogEvent, @@ -26993,7 +27034,6 @@ _swigt__p_wxMDIParentFrame, _swigt__p_wxPoint, _swigt__p_wxObject, _swigt__p_wxOutputStream, -_swigt__p_wxPyScrolledWindow, _swigt__p_wxMDIClientWindow, _swigt__p_wxTipWindow, _swigt__p_wxPyPopupTransientWindow, @@ -27007,6 +27047,7 @@ _swigt__p_wxTopLevelWindow, _swigt__p_wxWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxMenuBar, +_swigt__p_wxPyScrolledWindow, _swigt__p_wxPrintPreview, _swigt__p_wxSashEvent, _swigt__p_wxString, diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 52bab55394..cc9ad77c39 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -1435,6 +1435,10 @@ class NativeFontInfo(object): """GetPointSize(self) -> int""" return _gdi_.NativeFontInfo_GetPointSize(*args, **kwargs) + def GetPixelSize(*args, **kwargs): + """GetPixelSize(self) -> Size""" + return _gdi_.NativeFontInfo_GetPixelSize(*args, **kwargs) + def GetStyle(*args, **kwargs): """GetStyle(self) -> int""" return _gdi_.NativeFontInfo_GetStyle(*args, **kwargs) @@ -1463,6 +1467,10 @@ class NativeFontInfo(object): """SetPointSize(self, int pointsize)""" return _gdi_.NativeFontInfo_SetPointSize(*args, **kwargs) + def SetPixelSize(*args, **kwargs): + """SetPixelSize(self, Size pixelSize)""" + return _gdi_.NativeFontInfo_SetPixelSize(*args, **kwargs) + def SetStyle(*args, **kwargs): """SetStyle(self, int style)""" return _gdi_.NativeFontInfo_SetStyle(*args, **kwargs) @@ -1720,6 +1728,14 @@ class Font(GDIObject): """GetPointSize(self) -> int""" return _gdi_.Font_GetPointSize(*args, **kwargs) + def GetPixelSize(*args, **kwargs): + """GetPixelSize(self) -> Size""" + return _gdi_.Font_GetPixelSize(*args, **kwargs) + + def IsUsingSizeInPixels(*args, **kwargs): + """IsUsingSizeInPixels(self) -> bool""" + return _gdi_.Font_IsUsingSizeInPixels(*args, **kwargs) + def GetFamily(*args, **kwargs): """GetFamily(self) -> int""" return _gdi_.Font_GetFamily(*args, **kwargs) @@ -1764,6 +1780,10 @@ class Font(GDIObject): """SetPointSize(self, int pointSize)""" return _gdi_.Font_SetPointSize(*args, **kwargs) + def SetPixelSize(*args, **kwargs): + """SetPixelSize(self, Size pixelSize)""" + return _gdi_.Font_SetPixelSize(*args, **kwargs) + def SetFamily(*args, **kwargs): """SetFamily(self, int family)""" return _gdi_.Font_SetFamily(*args, **kwargs) @@ -1862,6 +1882,17 @@ def Font2(*args, **kwargs): val.thisown = 1 return val +def FontFromPixelSize(*args, **kwargs): + """ + FontFromPixelSize(Size pixelSize, int family, int style, int weight, + bool underlined=False, String face=wxEmptyString, + int encoding=FONTENCODING_DEFAULT) -> Font + """ + if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName'] + val = _gdi_.new_FontFromPixelSize(*args, **kwargs) + val.thisown = 1 + return val + def Font_GetDefaultEncoding(*args, **kwargs): """Font_GetDefaultEncoding() -> int""" return _gdi_.Font_GetDefaultEncoding(*args, **kwargs) diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 255cef42f0..b610ba353f 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -825,7 +825,7 @@ wxString wxNativeFontInfo___str__(wxNativeFontInfo *self){ wxNativeEncodingInfo* wxGetNativeFontEncoding(wxFontEncoding encoding) { wxPyRaiseNotImplemented(); return NULL; } - + bool wxTestFontEncoding(const wxNativeEncodingInfo& info) { wxPyRaiseNotImplemented(); return false; } @@ -846,6 +846,11 @@ wxFont *new_wxFont(wxString const &info){ wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags,wxString const &face,wxFontEncoding encoding){ return wxFont::New(pointSize, family, flags, face, encoding); } +wxFont *new_wxFont(wxSize const &pixelSize,int family,int style,int weight,bool underlined,wxString const &face,wxFontEncoding encoding){ + return wxFontBase::New(pixelSize, family, + style, weight, underlined, + face, encoding); + } bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : false; } bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : true; } @@ -6830,6 +6835,36 @@ static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *, PyObject *args, P } +static PyObject *_wrap_NativeFontInfo_GetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeFontInfo_GetPixelSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxNativeFontInfo const *)arg1)->GetPixelSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; @@ -7023,6 +7058,38 @@ static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *, PyObject *args, P } +static PyObject *_wrap_NativeFontInfo_SetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pixelSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPixelSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNativeFontInfo, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPixelSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; @@ -8491,6 +8558,79 @@ static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_new_FontFromPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSize *arg1 = 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + bool arg5 = (bool) false ; + wxString const &arg6_defvalue = wxEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + int arg7 = (int) wxFONTENCODING_DEFAULT ; + wxFont *result; + wxSize temp1 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "pixelSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underlined",(char *) "face",(char *) "encoding", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_FontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = &temp1; + if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; + } + arg2 = (int)SWIG_As_int(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int)SWIG_As_int(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (int)SWIG_As_int(obj3); + if (PyErr_Occurred()) SWIG_fail; + if (obj4) { + arg5 = (bool)SWIG_As_bool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + if (obj6) { + arg7 = (int)SWIG_As_int(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxFont *)new_wxFont((wxSize const &)*arg1,arg2,arg3,arg4,arg5,(wxString const &)*arg6,(wxFontEncoding )arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + static PyObject *_wrap_Font_Ok(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -8609,6 +8749,64 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_Font_GetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_GetPixelSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxFont const *)arg1)->GetPixelSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Font_IsUsingSizeInPixels(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_IsUsingSizeInPixels",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxFont const *)arg1)->IsUsingSizeInPixels(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Font_GetFamily(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -8920,6 +9118,38 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_Font_SetPixelSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFont *arg1 = (wxFont *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pixelSize", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPixelSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPixelSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Font_SetFamily(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; @@ -19336,6 +19566,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"NativeFontInfo_Init", (PyCFunction) _wrap_NativeFontInfo_Init, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_InitFromFont", (PyCFunction) _wrap_NativeFontInfo_InitFromFont, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_GetPointSize", (PyCFunction) _wrap_NativeFontInfo_GetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"NativeFontInfo_GetPixelSize", (PyCFunction) _wrap_NativeFontInfo_GetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_GetStyle", (PyCFunction) _wrap_NativeFontInfo_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_GetWeight", (PyCFunction) _wrap_NativeFontInfo_GetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_GetUnderlined", (PyCFunction) _wrap_NativeFontInfo_GetUnderlined, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -19343,6 +19574,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"NativeFontInfo_GetFamily", (PyCFunction) _wrap_NativeFontInfo_GetFamily, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_GetEncoding", (PyCFunction) _wrap_NativeFontInfo_GetEncoding, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_SetPointSize", (PyCFunction) _wrap_NativeFontInfo_SetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"NativeFontInfo_SetPixelSize", (PyCFunction) _wrap_NativeFontInfo_SetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_SetStyle", (PyCFunction) _wrap_NativeFontInfo_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_SetWeight", (PyCFunction) _wrap_NativeFontInfo_SetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"NativeFontInfo_SetUnderlined", (PyCFunction) _wrap_NativeFontInfo_SetUnderlined, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -19389,10 +19621,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_FontFromNativeInfo", (PyCFunction) _wrap_new_FontFromNativeInfo, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_FontFromNativeInfoString", (PyCFunction) _wrap_new_FontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_Font2", (PyCFunction) _wrap_new_Font2, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"new_FontFromPixelSize", (PyCFunction) _wrap_new_FontFromPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_Ok", (PyCFunction) _wrap_Font_Ok, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font___eq__", (PyCFunction) _wrap_Font___eq__, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font___ne__", (PyCFunction) _wrap_Font___ne__, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetPointSize", (PyCFunction) _wrap_Font_GetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_GetPixelSize", (PyCFunction) _wrap_Font_GetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_IsUsingSizeInPixels", (PyCFunction) _wrap_Font_IsUsingSizeInPixels, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetFamily", (PyCFunction) _wrap_Font_GetFamily, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetStyle", (PyCFunction) _wrap_Font_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetWeight", (PyCFunction) _wrap_Font_GetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -19404,6 +19639,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Font_GetNativeFontInfoDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoDesc, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_GetNativeFontInfoUserDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetPointSize", (PyCFunction) _wrap_Font_SetPointSize, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"Font_SetPixelSize", (PyCFunction) _wrap_Font_SetPixelSize, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetFamily", (PyCFunction) _wrap_Font_SetFamily, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetStyle", (PyCFunction) _wrap_Font_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"Font_SetWeight", (PyCFunction) _wrap_Font_SetWeight, METH_VARARGS | METH_KEYWORDS, NULL }, diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index b93f773749..e79ff9f604 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -376,6 +376,10 @@ class TopLevelWindow(_core.Window): """RequestUserAttention(self, int flags=USER_ATTENTION_INFO)""" return _windows_.TopLevelWindow_RequestUserAttention(*args, **kwargs) + def IsActive(*args, **kwargs): + """IsActive(self) -> bool""" + return _windows_.TopLevelWindow_IsActive(*args, **kwargs) + class TopLevelWindowPtr(TopLevelWindow): def __init__(self, this): @@ -2051,18 +2055,18 @@ def PreHtmlListBox(*args, **kwargs): class TaskBarIcon(_core.EvtHandler): def __repr__(self): - return "<%s.%s; proxy of C++ wxTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + return "<%s.%s; proxy of C++ wxPyTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """__init__(self) -> TaskBarIcon""" newobj = _windows_.new_TaskBarIcon(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown - def __del__(self, destroy=_windows_.delete_TaskBarIcon): - """__del__(self)""" - try: - if self.thisown: destroy(self) - except: pass + self._setCallbackInfo(self, TaskBarIcon, 0) + + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)""" + return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs) def Destroy(*args, **kwargs): """ @@ -2105,7 +2109,7 @@ class TaskBarIconEvent(_core.Event): def __repr__(self): return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, wxEventType evtType, TaskBarIcon tbIcon) -> TaskBarIconEvent""" + """__init__(self, wxEventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent""" newobj = _windows_.new_TaskBarIconEvent(*args, **kwargs) self.this = newobj.this self.thisown = 1 diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index 6bbe5d3eda..50ee112d3d 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -217,50 +217,50 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxEvent swig_types[6] #define SWIGTYPE_p_wxPrintData swig_types[7] #define SWIGTYPE_p_wxTaskBarIcon swig_types[8] -#define SWIGTYPE_p_wxIconBundle swig_types[9] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[10] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[11] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[12] -#define SWIGTYPE_p_wxFont swig_types[13] -#define SWIGTYPE_p_wxSplitterEvent swig_types[14] -#define SWIGTYPE_p_wxRegion swig_types[15] -#define SWIGTYPE_p_wxFindReplaceData swig_types[16] -#define SWIGTYPE_p_int swig_types[17] -#define SWIGTYPE_p_wxSize swig_types[18] -#define SWIGTYPE_p_wxDC swig_types[19] -#define SWIGTYPE_p_wxIcon swig_types[20] -#define SWIGTYPE_p_wxVisualAttributes swig_types[21] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[22] -#define SWIGTYPE_p_wxColourData swig_types[23] -#define SWIGTYPE_p_wxNotifyEvent swig_types[24] -#define SWIGTYPE_p_wxPyWindow swig_types[25] -#define SWIGTYPE_p_wxSplashScreen swig_types[26] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[27] -#define SWIGTYPE_p_wxProgressDialog swig_types[28] -#define SWIGTYPE_p_wxMessageDialog swig_types[29] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[30] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[31] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[32] -#define SWIGTYPE_p_wxFileDialog swig_types[33] -#define SWIGTYPE_p_wxPrinter swig_types[34] -#define SWIGTYPE_p_wxArrayInt swig_types[35] -#define SWIGTYPE_p_wxEvtHandler swig_types[36] -#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[37] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[38] -#define SWIGTYPE_p_wxPyVListBox swig_types[39] -#define SWIGTYPE_p_wxRect swig_types[40] -#define SWIGTYPE_p_char swig_types[41] -#define SWIGTYPE_p_wxMiniFrame swig_types[42] -#define SWIGTYPE_p_wxFrame swig_types[43] -#define SWIGTYPE_p_wxPyPrintout swig_types[44] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[45] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[46] -#define SWIGTYPE_p_wxStatusBar swig_types[47] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[48] -#define SWIGTYPE_p_wxPoint swig_types[49] -#define SWIGTYPE_p_wxObject swig_types[50] -#define SWIGTYPE_p_wxOutputStream swig_types[51] -#define SWIGTYPE_p_wxPyScrolledWindow swig_types[52] +#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[9] +#define SWIGTYPE_p_wxIconBundle swig_types[10] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[11] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[12] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[13] +#define SWIGTYPE_p_wxFont swig_types[14] +#define SWIGTYPE_p_wxSplitterEvent swig_types[15] +#define SWIGTYPE_p_wxRegion swig_types[16] +#define SWIGTYPE_p_wxFindReplaceData swig_types[17] +#define SWIGTYPE_p_int swig_types[18] +#define SWIGTYPE_p_wxSize swig_types[19] +#define SWIGTYPE_p_wxDC swig_types[20] +#define SWIGTYPE_p_wxIcon swig_types[21] +#define SWIGTYPE_p_wxVisualAttributes swig_types[22] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[23] +#define SWIGTYPE_p_wxColourData swig_types[24] +#define SWIGTYPE_p_wxNotifyEvent swig_types[25] +#define SWIGTYPE_p_wxPyWindow swig_types[26] +#define SWIGTYPE_p_wxSplashScreen swig_types[27] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[28] +#define SWIGTYPE_p_wxProgressDialog swig_types[29] +#define SWIGTYPE_p_wxMessageDialog swig_types[30] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[31] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[32] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[33] +#define SWIGTYPE_p_wxFileDialog swig_types[34] +#define SWIGTYPE_p_wxPrinter swig_types[35] +#define SWIGTYPE_p_wxArrayInt swig_types[36] +#define SWIGTYPE_p_wxEvtHandler swig_types[37] +#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[38] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[39] +#define SWIGTYPE_p_wxPyVListBox swig_types[40] +#define SWIGTYPE_p_wxRect swig_types[41] +#define SWIGTYPE_p_char swig_types[42] +#define SWIGTYPE_p_wxMiniFrame swig_types[43] +#define SWIGTYPE_p_wxFrame swig_types[44] +#define SWIGTYPE_p_wxPyPrintout swig_types[45] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[46] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[47] +#define SWIGTYPE_p_wxStatusBar swig_types[48] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[49] +#define SWIGTYPE_p_wxPoint swig_types[50] +#define SWIGTYPE_p_wxObject swig_types[51] +#define SWIGTYPE_p_wxOutputStream swig_types[52] #define SWIGTYPE_p_wxMDIClientWindow swig_types[53] #define SWIGTYPE_p_wxTipWindow swig_types[54] #define SWIGTYPE_p_wxSashLayoutWindow swig_types[55] @@ -274,27 +274,28 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxWindow swig_types[63] #define SWIGTYPE_p_wxScrolledWindow swig_types[64] #define SWIGTYPE_p_wxMenuBar swig_types[65] -#define SWIGTYPE_p_wxPrintPreview swig_types[66] -#define SWIGTYPE_p_wxSashEvent swig_types[67] -#define SWIGTYPE_p_wxString swig_types[68] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[69] -#define SWIGTYPE_p_wxFontDialog swig_types[70] -#define SWIGTYPE_p_wxDirDialog swig_types[71] -#define SWIGTYPE_p_wxColourDialog swig_types[72] -#define SWIGTYPE_p_wxDialog swig_types[73] -#define SWIGTYPE_p_wxPanel swig_types[74] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[75] -#define SWIGTYPE_p_wxPrintDialog swig_types[76] -#define SWIGTYPE_p_wxFileSystem swig_types[77] -#define SWIGTYPE_p_wxBitmap swig_types[78] -#define SWIGTYPE_p_wxCommandEvent swig_types[79] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[80] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[81] -#define SWIGTYPE_p_wxColour swig_types[82] -#define SWIGTYPE_p_wxToolBar swig_types[83] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[84] -#define SWIGTYPE_p_wxPrintDialogData swig_types[85] -static swig_type_info *swig_types[87]; +#define SWIGTYPE_p_wxPyScrolledWindow swig_types[66] +#define SWIGTYPE_p_wxPrintPreview swig_types[67] +#define SWIGTYPE_p_wxSashEvent swig_types[68] +#define SWIGTYPE_p_wxString swig_types[69] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[70] +#define SWIGTYPE_p_wxFontDialog swig_types[71] +#define SWIGTYPE_p_wxDirDialog swig_types[72] +#define SWIGTYPE_p_wxColourDialog swig_types[73] +#define SWIGTYPE_p_wxDialog swig_types[74] +#define SWIGTYPE_p_wxPanel swig_types[75] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[76] +#define SWIGTYPE_p_wxPrintDialog swig_types[77] +#define SWIGTYPE_p_wxFileSystem swig_types[78] +#define SWIGTYPE_p_wxBitmap swig_types[79] +#define SWIGTYPE_p_wxCommandEvent swig_types[80] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[81] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[82] +#define SWIGTYPE_p_wxColour swig_types[83] +#define SWIGTYPE_p_wxToolBar swig_types[84] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[85] +#define SWIGTYPE_p_wxPrintDialogData swig_types[86] +static swig_type_info *swig_types[88]; /* -------- TYPES TABLE (END) -------- */ @@ -953,45 +954,44 @@ enum { #else -// // Otherwise make a class that can virtualize CreatePopupMenu -// class wxPyTaskBarIcon : public wxTaskBarIcon -// { -// DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon); -// public: -// wxPyTaskBarIcon() : wxTaskBarIcon() -// {} - -// wxMenu* CreatePopupMenu() { -// wxMenu *rval = NULL; -// bool found; -// bool blocked = wxPyBeginBlockThreads(); -// if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { -// PyObject* ro; -// wxMenu* ptr; -// ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); -// if (ro) { -// if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxMenu"))) -// rval = ptr; -// Py_DECREF(ro); -// } -// } -// wxPyEndBlockThreads(blocked); -// if (! found) -// rval = wxTaskBarIcon::CreatePopupMenu(); -// return rval; -// } - -// PYPRIVATE; -// }; - -// IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon); +// Otherwise make a class that can virtualize CreatePopupMenu +class wxPyTaskBarIcon : public wxTaskBarIcon +{ + DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon); +public: + wxPyTaskBarIcon() : wxTaskBarIcon() + {} + + wxMenu* CreatePopupMenu() { + wxMenu *rval = NULL; + bool found; + bool blocked = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { + PyObject* ro; + wxMenu* ptr; + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); + if (ro) { + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxMenu"))) + rval = ptr; + Py_DECREF(ro); + } + } + wxPyEndBlockThreads(blocked); + if (! found) + rval = wxTaskBarIcon::CreatePopupMenu(); + return rval; + } + + PYPRIVATE; +}; + +IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon); #endif -void wxTaskBarIcon_Destroy(wxTaskBarIcon *self){ - +void wxPyTaskBarIcon_Destroy(wxPyTaskBarIcon *self){ self->RemoveIcon(); - + delete self; } static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); @@ -3308,6 +3308,34 @@ static PyObject *_wrap_TopLevelWindow_RequestUserAttention(PyObject *, PyObject } +static PyObject *_wrap_TopLevelWindow_IsActive(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TopLevelWindow_IsActive",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTopLevelWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->IsActive(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * TopLevelWindow_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -11135,7 +11163,7 @@ static PyObject * HtmlListBox_swigregister(PyObject *, PyObject *args) { } static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *result; + wxPyTaskBarIcon *result; char *kwnames[] = { NULL }; @@ -11144,32 +11172,42 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwa { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTaskBarIcon *)new wxTaskBarIcon(); + result = (wxPyTaskBarIcon *)new wxPyTaskBarIcon(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTaskBarIcon, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTaskBarIcon, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + int arg4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TaskBarIcon",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TaskBarIcon__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = obj1; + arg3 = obj2; + arg4 = (int)SWIG_As_int(obj3); + if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; + (arg1)->_setCallbackInfo(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11183,18 +11221,18 @@ static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_Destroy",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxTaskBarIcon_Destroy(arg1); + wxPyTaskBarIcon_Destroy(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11208,7 +11246,7 @@ static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *, PyObject *args, PyObject static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11216,11 +11254,11 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_IsOk",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTaskBarIcon const *)arg1)->IsOk(); + result = (bool)((wxPyTaskBarIcon const *)arg1)->IsOk(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11236,7 +11274,7 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *, PyObject *args, PyObject *kw static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11244,11 +11282,11 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_IsIconInstalled",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTaskBarIcon const *)arg1)->IsIconInstalled(); + result = (bool)((wxPyTaskBarIcon const *)arg1)->IsIconInstalled(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11264,7 +11302,7 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *, PyObject *args, P static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; wxIcon *arg2 = 0 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; @@ -11278,7 +11316,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TaskBarIcon_SetIcon",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) @@ -11320,7 +11358,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *, PyObject *args, PyObject static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -11328,7 +11366,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObje }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_RemoveIcon",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11348,7 +11386,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *, PyObject *args, PyObje static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; wxMenu *arg2 = (wxMenu *) 0 ; bool result; PyObject * obj0 = 0 ; @@ -11358,7 +11396,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TaskBarIcon_PopupMenu",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; @@ -11381,7 +11419,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *, PyObject *args, PyObjec static PyObject * TaskBarIcon_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxTaskBarIcon, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxPyTaskBarIcon, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -25371,6 +25409,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TopLevelWindow_GetTitle", (PyCFunction) _wrap_TopLevelWindow_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_SetShape", (PyCFunction) _wrap_TopLevelWindow_SetShape, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_RequestUserAttention", (PyCFunction) _wrap_TopLevelWindow_RequestUserAttention, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"TopLevelWindow_IsActive", (PyCFunction) _wrap_TopLevelWindow_IsActive, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TopLevelWindow_swigregister", TopLevelWindow_swigregister, METH_VARARGS, NULL }, { (char *)"new_Frame", (PyCFunction) _wrap_new_Frame, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"new_PreFrame", (PyCFunction) _wrap_new_PreFrame, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -25605,7 +25644,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL }, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL }, - { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL }, + { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS, NULL }, { (char *)"TaskBarIcon_IsIconInstalled", (PyCFunction) _wrap_TaskBarIcon_IsIconInstalled, METH_VARARGS | METH_KEYWORDS, NULL }, @@ -26299,8 +26338,8 @@ static void *_p_wxPreviewControlBarTo_p_wxEvtHandler(void *x) { static void *_p_wxPyPreviewControlBarTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } -static void *_p_wxTaskBarIconTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxTaskBarIcon *) x)); +static void *_p_wxPyTaskBarIconTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyTaskBarIcon *) x)); } static void *_p_wxFrameTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxFrame *) x)); @@ -26413,8 +26452,8 @@ static void *_p_wxInitDialogEventTo_p_wxObject(void *x) { static void *_p_wxLayoutAlgorithmTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutAlgorithm *) x)); } -static void *_p_wxTaskBarIconTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxEvtHandler *) ((wxTaskBarIcon *) x)); +static void *_p_wxPyTaskBarIconTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *) ((wxPyTaskBarIcon *) x)); } static void *_p_wxFindDialogEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxFindDialogEvent *) x)); @@ -27070,6 +27109,7 @@ static swig_type_info _swigt__p_wxFontData[] = {{"_p_wxFontData", 0, "wxFontData static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEvent", 0, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0, 0, 0, 0},{"_p_wxPrintData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTaskBarIcon[] = {{"_p_wxTaskBarIcon", 0, "wxTaskBarIcon *", 0, 0, 0, 0},{"_p_wxTaskBarIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyTaskBarIcon[] = {{"_p_wxPyTaskBarIcon", 0, "wxPyTaskBarIcon *", 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxIconBundle[] = {{"_p_wxIconBundle", 0, "wxIconBundle *", 0, 0, 0, 0},{"_p_wxIconBundle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLayoutAlgorithm[] = {{"_p_wxLayoutAlgorithm", 0, "wxLayoutAlgorithm *", 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFindDialogEvent[] = {{"_p_wxFindDialogEvent", 0, "wxFindDialogEvent *", 0, 0, 0, 0},{"_p_wxFindDialogEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -27097,7 +27137,7 @@ static swig_type_info _swigt__p_wxMultiChoiceDialog[] = {{"_p_wxMultiChoiceDialo static swig_type_info _swigt__p_wxFileDialog[] = {{"_p_wxFileDialog", 0, "wxFileDialog *", 0, 0, 0, 0},{"_p_wxFileDialog", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrinter[] = {{"_p_wxPrinter", 0, "wxPrinter *", 0, 0, 0, 0},{"_p_wxPrinter", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxArrayInt[] = {{"_p_wxArrayInt", 0, "wxArrayInt *", 0, 0, 0, 0},{"_p_wxArrayInt", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCalculateLayoutEvent[] = {{"_p_wxCalculateLayoutEvent", 0, "wxCalculateLayoutEvent *", 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyHtmlListBox[] = {{"_p_wxPyHtmlListBox", 0, "wxPyHtmlListBox *", 0, 0, 0, 0},{"_p_wxPyHtmlListBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyVListBox[] = {{"_p_wxPyVListBox", 0, "wxPyVListBox *", 0, 0, 0, 0},{"_p_wxPyVListBox", 0, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVListBox, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -27111,9 +27151,8 @@ static swig_type_info _swigt__p_wxScrollWinEvent[] = {{"_p_wxScrollWinEvent", 0, static swig_type_info _swigt__p_wxStatusBar[] = {{"_p_wxStatusBar", 0, "wxStatusBar *", 0, 0, 0, 0},{"_p_wxStatusBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMDIParentFrame[] = {{"_p_wxMDIParentFrame", 0, "wxMDIParentFrame *", 0, 0, 0, 0},{"_p_wxMDIParentFrame", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0, 0, 0, 0},{"_p_wxOutputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPyScrolledWindow[] = {{"_p_wxPyScrolledWindow", 0, "wxPyScrolledWindow *", 0, 0, 0, 0},{"_p_wxPyScrolledWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow", 0, "wxMDIClientWindow *", 0, 0, 0, 0},{"_p_wxMDIClientWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTipWindow[] = {{"_p_wxTipWindow", 0, "wxTipWindow *", 0, 0, 0, 0},{"_p_wxTipWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSashLayoutWindow[] = {{"_p_wxSashLayoutWindow", 0, "wxSashLayoutWindow *", 0, 0, 0, 0},{"_p_wxSashLayoutWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -27127,6 +27166,7 @@ static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0, 0, 0, 0},{"_p_wxMenuBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyScrolledWindow[] = {{"_p_wxPyScrolledWindow", 0, "wxPyScrolledWindow *", 0, 0, 0, 0},{"_p_wxPyScrolledWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintPreview[] = {{"_p_wxPrintPreview", 0, "wxPrintPreview *", 0, 0, 0, 0},{"_p_wxPrintPreview", 0, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxPrintPreview, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSashEvent[] = {{"_p_wxSashEvent", 0, "wxSashEvent *", 0, 0, 0, 0},{"_p_wxSashEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -27158,6 +27198,7 @@ _swigt__p_wxFontData, _swigt__p_wxEvent, _swigt__p_wxPrintData, _swigt__p_wxTaskBarIcon, +_swigt__p_wxPyTaskBarIcon, _swigt__p_wxIconBundle, _swigt__p_wxLayoutAlgorithm, _swigt__p_wxFindDialogEvent, @@ -27201,7 +27242,6 @@ _swigt__p_wxMDIParentFrame, _swigt__p_wxPoint, _swigt__p_wxObject, _swigt__p_wxOutputStream, -_swigt__p_wxPyScrolledWindow, _swigt__p_wxMDIClientWindow, _swigt__p_wxTipWindow, _swigt__p_wxSashLayoutWindow, @@ -27215,6 +27255,7 @@ _swigt__p_wxTopLevelWindow, _swigt__p_wxWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxMenuBar, +_swigt__p_wxPyScrolledWindow, _swigt__p_wxPrintPreview, _swigt__p_wxSashEvent, _swigt__p_wxString, -- 2.47.2