From 025fa9a96bba741d6825ce8f78df37dc07dc6062 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 18 Oct 2003 04:56:15 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/glcanvas/msw/glcanvas.cpp | 4 - wxPython/contrib/stc/msw/stc_.cpp | 173 +++++++++++++++++--- wxPython/contrib/stc/msw/stc_.py | 85 +++++++++- wxPython/src/msw/controls.cpp | 181 +++++++++++++++++++++ wxPython/src/msw/controls.py | 24 +++ wxPython/src/msw/controls2.cpp | 109 ++++++++++++- wxPython/src/msw/controls2.py | 11 ++ wxPython/src/msw/events.cpp | 148 ++++++++--------- wxPython/src/msw/events.py | 24 +-- wxPython/src/msw/fonts.cpp | 83 +++++++--- wxPython/src/msw/fonts.py | 13 +- wxPython/src/msw/gdi.cpp | 31 ++++ wxPython/src/msw/gdi.py | 5 +- wxPython/src/msw/windows.cpp | 106 ++++++++++++ wxPython/src/msw/windows.py | 10 ++ wxPython/src/msw/windows2.cpp | 4 +- wxPython/src/msw/wx.cpp | 43 +---- wxPython/src/msw/wx.py | 15 +- 18 files changed, 868 insertions(+), 201 deletions(-) diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.cpp b/wxPython/contrib/glcanvas/msw/glcanvas.cpp index 47b3d9c3b0..d34031fb18 100644 --- a/wxPython/contrib/glcanvas/msw/glcanvas.cpp +++ b/wxPython/contrib/glcanvas/msw/glcanvas.cpp @@ -56,10 +56,6 @@ extern PyObject *SWIG_newvarlink(void); #include "wxPython.h" -#ifdef __WXMAC__ // avoid a bug in Carbon headers -#define scalb scalbn -#endif - #ifdef __WXMSW__ #include "myglcanvas.h" #else diff --git a/wxPython/contrib/stc/msw/stc_.cpp b/wxPython/contrib/stc/msw/stc_.cpp index 4f192dcf21..05b7900b03 100644 --- a/wxPython/contrib/stc/msw/stc_.cpp +++ b/wxPython/contrib/stc/msw/stc_.cpp @@ -9010,8 +9010,8 @@ static PyObject *_wrap_wxStyledTextCtrl_GetMouseDownCaptures(PyObject *self, PyO return _resultobj; } -#define wxStyledTextCtrl_SetCursor(_swigobj,_swigarg0) (_swigobj->SetCursor(_swigarg0)) -static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxStyledTextCtrl_SetSTCCursor(_swigobj,_swigarg0) (_swigobj->SetSTCCursor(_swigarg0)) +static PyObject *_wrap_wxStyledTextCtrl_SetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxStyledTextCtrl * _arg0; int _arg1; @@ -9019,18 +9019,18 @@ static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args char *_kwnames[] = { "self","cursorType", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetCursor",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetSTCCursor",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetCursor. Expected _wxStyledTextCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetSTCCursor. Expected _wxStyledTextCtrl_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxStyledTextCtrl_SetCursor(_arg0,_arg1); + wxStyledTextCtrl_SetSTCCursor(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -9039,8 +9039,8 @@ static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args return _resultobj; } -#define wxStyledTextCtrl_GetCursor(_swigobj) (_swigobj->GetCursor()) -static PyObject *_wrap_wxStyledTextCtrl_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxStyledTextCtrl_GetSTCCursor(_swigobj) (_swigobj->GetSTCCursor()) +static PyObject *_wrap_wxStyledTextCtrl_GetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxStyledTextCtrl * _arg0; @@ -9048,18 +9048,18 @@ static PyObject *_wrap_wxStyledTextCtrl_GetCursor(PyObject *self, PyObject *args char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetCursor",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetSTCCursor",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetCursor. Expected _wxStyledTextCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetSTCCursor. Expected _wxStyledTextCtrl_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxStyledTextCtrl_GetCursor(_arg0); + _result = (int )wxStyledTextCtrl_GetSTCCursor(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -10626,6 +10626,78 @@ static PyObject *_wrap_wxStyledTextCtrl_LoadFile(PyObject *self, PyObject *args, return _resultobj; } +#define wxStyledTextCtrl_DoDragOver(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DoDragOver(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxStyledTextCtrl_DoDragOver(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDragResult _result; + wxStyledTextCtrl * _arg0; + wxCoord _arg1; + wxCoord _arg2; + wxDragResult _arg3; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","def", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxStyledTextCtrl_DoDragOver",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_DoDragOver. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxDragResult )wxStyledTextCtrl_DoDragOver(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxStyledTextCtrl_DoDropText(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DoDropText(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxStyledTextCtrl_DoDropText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxStyledTextCtrl * _arg0; + long _arg1; + long _arg2; + wxString * _arg3; + PyObject * _argo0 = 0; + PyObject * _obj3 = 0; + char *_kwnames[] = { "self","x","y","data", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO:wxStyledTextCtrl_DoDropText",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_DoDropText. Expected _wxStyledTextCtrl_p."); + return NULL; + } + } +{ + _arg3 = wxString_in_helper(_obj3); + if (_arg3 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxStyledTextCtrl_DoDropText(_arg0,_arg1,_arg2,*_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj3) + delete _arg3; +} + return _resultobj; +} + static void *SwigwxStyledTextEventTowxCommandEvent(void *ptr) { wxStyledTextEvent *src; wxCommandEvent *dest; @@ -12052,6 +12124,8 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextEvent_SetPosition", (PyCFunction) _wrap_wxStyledTextEvent_SetPosition, METH_VARARGS | METH_KEYWORDS }, { "delete_wxStyledTextEvent", (PyCFunction) _wrap_delete_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS }, { "new_wxStyledTextEvent", (PyCFunction) _wrap_new_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_DoDropText", (PyCFunction) _wrap_wxStyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_DoDragOver", (PyCFunction) _wrap_wxStyledTextCtrl_DoDragOver, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_LoadFile", (PyCFunction) _wrap_wxStyledTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SaveFile", (PyCFunction) _wrap_wxStyledTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetLastKeydownProcessed", (PyCFunction) _wrap_wxStyledTextCtrl_SetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS }, @@ -12100,8 +12174,8 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextCtrl_WordPartLeft", (PyCFunction) _wrap_wxStyledTextCtrl_WordPartLeft, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_GetControlCharSymbol", (PyCFunction) _wrap_wxStyledTextCtrl_GetControlCharSymbol, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetControlCharSymbol", (PyCFunction) _wrap_wxStyledTextCtrl_SetControlCharSymbol, METH_VARARGS | METH_KEYWORDS }, - { "wxStyledTextCtrl_GetCursor", (PyCFunction) _wrap_wxStyledTextCtrl_GetCursor, METH_VARARGS | METH_KEYWORDS }, - { "wxStyledTextCtrl_SetCursor", (PyCFunction) _wrap_wxStyledTextCtrl_SetCursor, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_GetSTCCursor", (PyCFunction) _wrap_wxStyledTextCtrl_GetSTCCursor, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextCtrl_SetSTCCursor", (PyCFunction) _wrap_wxStyledTextCtrl_SetSTCCursor, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_GetMouseDownCaptures", (PyCFunction) _wrap_wxStyledTextCtrl_GetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_SetMouseDownCaptures", (PyCFunction) _wrap_wxStyledTextCtrl_SetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextCtrl_GetStatus", (PyCFunction) _wrap_wxStyledTextCtrl_GetStatus, METH_VARARGS | METH_KEYWORDS }, @@ -12515,6 +12589,7 @@ SWIGEXPORT(void) initstc_c() { SWIG_globals = SWIG_newvarlink(); m = Py_InitModule("stc_c", stc_cMethods); d = PyModule_GetDict(m); + PyDict_SetItemString(d,"STC_USE_DND", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxSTC_USE_POPUP", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxSTC_INVALID_POSITION", PyInt_FromLong((long) -1)); PyDict_SetItemString(d,"wxSTC_START", PyInt_FromLong((long) 2000)); @@ -12602,6 +12677,7 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_INDIC_TT", PyInt_FromLong((long) 2)); PyDict_SetItemString(d,"wxSTC_INDIC_DIAGONAL", PyInt_FromLong((long) 3)); PyDict_SetItemString(d,"wxSTC_INDIC_STRIKE", PyInt_FromLong((long) 4)); + PyDict_SetItemString(d,"wxSTC_INDIC_HIDDEN", PyInt_FromLong((long) 5)); PyDict_SetItemString(d,"wxSTC_INDIC0_MASK", PyInt_FromLong((long) 0x20)); PyDict_SetItemString(d,"wxSTC_INDIC1_MASK", PyInt_FromLong((long) 0x40)); PyDict_SetItemString(d,"wxSTC_INDIC2_MASK", PyInt_FromLong((long) 0x80)); @@ -12648,6 +12724,7 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_CARET_STRICT", PyInt_FromLong((long) 0x04)); PyDict_SetItemString(d,"wxSTC_CARET_JUMPS", PyInt_FromLong((long) 0x10)); PyDict_SetItemString(d,"wxSTC_CARET_EVEN", PyInt_FromLong((long) 0x08)); + PyDict_SetItemString(d,"wxSTC_KEYWORDSET_MAX", PyInt_FromLong((long) 8)); PyDict_SetItemString(d,"wxSTC_MOD_INSERTTEXT", PyInt_FromLong((long) 0x1)); PyDict_SetItemString(d,"wxSTC_MOD_DELETETEXT", PyInt_FromLong((long) 0x2)); PyDict_SetItemString(d,"wxSTC_MOD_CHANGESTYLE", PyInt_FromLong((long) 0x4)); @@ -12722,6 +12799,9 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_LEX_POV", PyInt_FromLong((long) 39)); PyDict_SetItemString(d,"wxSTC_LEX_LOUT", PyInt_FromLong((long) 40)); PyDict_SetItemString(d,"wxSTC_LEX_ESCRIPT", PyInt_FromLong((long) 41)); + PyDict_SetItemString(d,"wxSTC_LEX_PS", PyInt_FromLong((long) 42)); + PyDict_SetItemString(d,"wxSTC_LEX_NSIS", PyInt_FromLong((long) 43)); + PyDict_SetItemString(d,"wxSTC_LEX_MMIXAL", PyInt_FromLong((long) 44)); PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000)); PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1)); @@ -12934,6 +13014,8 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_LUA_WORD4", PyInt_FromLong((long) 15)); PyDict_SetItemString(d,"wxSTC_LUA_WORD5", PyInt_FromLong((long) 16)); PyDict_SetItemString(d,"wxSTC_LUA_WORD6", PyInt_FromLong((long) 17)); + PyDict_SetItemString(d,"wxSTC_LUA_WORD7", PyInt_FromLong((long) 18)); + PyDict_SetItemString(d,"wxSTC_LUA_WORD8", PyInt_FromLong((long) 19)); PyDict_SetItemString(d,"wxSTC_ERR_DEFAULT", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"wxSTC_ERR_PYTHON", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxSTC_ERR_GCC", PyInt_FromLong((long) 2)); @@ -13121,14 +13203,20 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_POV_DEFAULT", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"wxSTC_POV_COMMENT", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxSTC_POV_COMMENTLINE", PyInt_FromLong((long) 2)); - PyDict_SetItemString(d,"wxSTC_POV_COMMENTDOC", PyInt_FromLong((long) 3)); - PyDict_SetItemString(d,"wxSTC_POV_NUMBER", PyInt_FromLong((long) 4)); - PyDict_SetItemString(d,"wxSTC_POV_WORD", PyInt_FromLong((long) 5)); + PyDict_SetItemString(d,"wxSTC_POV_NUMBER", PyInt_FromLong((long) 3)); + PyDict_SetItemString(d,"wxSTC_POV_OPERATOR", PyInt_FromLong((long) 4)); + PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 5)); PyDict_SetItemString(d,"wxSTC_POV_STRING", PyInt_FromLong((long) 6)); - PyDict_SetItemString(d,"wxSTC_POV_OPERATOR", PyInt_FromLong((long) 7)); - PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 8)); - PyDict_SetItemString(d,"wxSTC_POV_BRACE", PyInt_FromLong((long) 9)); + PyDict_SetItemString(d,"wxSTC_POV_STRINGEOL", PyInt_FromLong((long) 7)); + PyDict_SetItemString(d,"wxSTC_POV_DIRECTIVE", PyInt_FromLong((long) 8)); + PyDict_SetItemString(d,"wxSTC_POV_BADDIRECTIVE", PyInt_FromLong((long) 9)); PyDict_SetItemString(d,"wxSTC_POV_WORD2", PyInt_FromLong((long) 10)); + PyDict_SetItemString(d,"wxSTC_POV_WORD3", PyInt_FromLong((long) 11)); + PyDict_SetItemString(d,"wxSTC_POV_WORD4", PyInt_FromLong((long) 12)); + PyDict_SetItemString(d,"wxSTC_POV_WORD5", PyInt_FromLong((long) 13)); + PyDict_SetItemString(d,"wxSTC_POV_WORD6", PyInt_FromLong((long) 14)); + PyDict_SetItemString(d,"wxSTC_POV_WORD7", PyInt_FromLong((long) 15)); + PyDict_SetItemString(d,"wxSTC_POV_WORD8", PyInt_FromLong((long) 16)); PyDict_SetItemString(d,"wxSTC_LOUT_DEFAULT", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"wxSTC_LOUT_COMMENT", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxSTC_LOUT_NUMBER", PyInt_FromLong((long) 2)); @@ -13152,6 +13240,54 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_ESCRIPT_BRACE", PyInt_FromLong((long) 9)); PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD2", PyInt_FromLong((long) 10)); PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD3", PyInt_FromLong((long) 11)); + PyDict_SetItemString(d,"wxSTC_PS_DEFAULT", PyInt_FromLong((long) 0)); + PyDict_SetItemString(d,"wxSTC_PS_COMMENT", PyInt_FromLong((long) 1)); + PyDict_SetItemString(d,"wxSTC_PS_DSC_COMMENT", PyInt_FromLong((long) 2)); + PyDict_SetItemString(d,"wxSTC_PS_DSC_VALUE", PyInt_FromLong((long) 3)); + PyDict_SetItemString(d,"wxSTC_PS_NUMBER", PyInt_FromLong((long) 4)); + PyDict_SetItemString(d,"wxSTC_PS_NAME", PyInt_FromLong((long) 5)); + PyDict_SetItemString(d,"wxSTC_PS_KEYWORD", PyInt_FromLong((long) 6)); + PyDict_SetItemString(d,"wxSTC_PS_LITERAL", PyInt_FromLong((long) 7)); + PyDict_SetItemString(d,"wxSTC_PS_IMMEVAL", PyInt_FromLong((long) 8)); + PyDict_SetItemString(d,"wxSTC_PS_PAREN_ARRAY", PyInt_FromLong((long) 9)); + PyDict_SetItemString(d,"wxSTC_PS_PAREN_DICT", PyInt_FromLong((long) 10)); + PyDict_SetItemString(d,"wxSTC_PS_PAREN_PROC", PyInt_FromLong((long) 11)); + PyDict_SetItemString(d,"wxSTC_PS_TEXT", PyInt_FromLong((long) 12)); + PyDict_SetItemString(d,"wxSTC_PS_HEXSTRING", PyInt_FromLong((long) 13)); + PyDict_SetItemString(d,"wxSTC_PS_BASE85STRING", PyInt_FromLong((long) 14)); + PyDict_SetItemString(d,"wxSTC_PS_BADSTRINGCHAR", PyInt_FromLong((long) 15)); + PyDict_SetItemString(d,"wxSTC_NSIS_DEFAULT", PyInt_FromLong((long) 0)); + PyDict_SetItemString(d,"wxSTC_NSIS_COMMENT", PyInt_FromLong((long) 1)); + PyDict_SetItemString(d,"wxSTC_NSIS_STRINGDQ", PyInt_FromLong((long) 2)); + PyDict_SetItemString(d,"wxSTC_NSIS_STRINGLQ", PyInt_FromLong((long) 3)); + PyDict_SetItemString(d,"wxSTC_NSIS_STRINGRQ", PyInt_FromLong((long) 4)); + PyDict_SetItemString(d,"wxSTC_NSIS_FUNCTION", PyInt_FromLong((long) 5)); + PyDict_SetItemString(d,"wxSTC_NSIS_VARIABLE", PyInt_FromLong((long) 6)); + PyDict_SetItemString(d,"wxSTC_NSIS_LABEL", PyInt_FromLong((long) 7)); + PyDict_SetItemString(d,"wxSTC_NSIS_USERDEFINED", PyInt_FromLong((long) 8)); + PyDict_SetItemString(d,"wxSTC_NSIS_SECTIONDEF", PyInt_FromLong((long) 9)); + PyDict_SetItemString(d,"wxSTC_NSIS_SUBSECTIONDEF", PyInt_FromLong((long) 10)); + PyDict_SetItemString(d,"wxSTC_NSIS_IFDEFINEDEF", PyInt_FromLong((long) 11)); + PyDict_SetItemString(d,"wxSTC_NSIS_MACRODEF", PyInt_FromLong((long) 12)); + PyDict_SetItemString(d,"wxSTC_NSIS_STRINGVAR", PyInt_FromLong((long) 13)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_LEADWS", PyInt_FromLong((long) 0)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_COMMENT", PyInt_FromLong((long) 1)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_LABEL", PyInt_FromLong((long) 2)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE", PyInt_FromLong((long) 3)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_PRE", PyInt_FromLong((long) 4)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_VALID", PyInt_FromLong((long) 5)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_UNKNOWN", PyInt_FromLong((long) 6)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_POST", PyInt_FromLong((long) 7)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_OPERANDS", PyInt_FromLong((long) 8)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_NUMBER", PyInt_FromLong((long) 9)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_REF", PyInt_FromLong((long) 10)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_CHAR", PyInt_FromLong((long) 11)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_STRING", PyInt_FromLong((long) 12)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_REGISTER", PyInt_FromLong((long) 13)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_HEX", PyInt_FromLong((long) 14)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_OPERATOR", PyInt_FromLong((long) 15)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_SYMBOL", PyInt_FromLong((long) 16)); + PyDict_SetItemString(d,"wxSTC_MMIXAL_INCLUDE", PyInt_FromLong((long) 17)); PyDict_SetItemString(d,"wxSTC_CMD_REDO", PyInt_FromLong((long) 2011)); PyDict_SetItemString(d,"wxSTC_CMD_SELECTALL", PyInt_FromLong((long) 2013)); PyDict_SetItemString(d,"wxSTC_CMD_UNDO", PyInt_FromLong((long) 2176)); @@ -13225,7 +13361,6 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_CMD_PARADOWNEXTEND", PyInt_FromLong((long) 2414)); PyDict_SetItemString(d,"wxSTC_CMD_PARAUP", PyInt_FromLong((long) 2415)); PyDict_SetItemString(d,"wxSTC_CMD_PARAUPEXTEND", PyInt_FromLong((long) 2416)); - PyDict_SetItemString(d,"STC_USE_DND", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE)); PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", PyInt_FromLong((long) wxEVT_STC_STYLENEEDED)); PyDict_SetItemString(d,"wxEVT_STC_CHARADDED", PyInt_FromLong((long) wxEVT_STC_CHARADDED)); diff --git a/wxPython/contrib/stc/msw/stc_.py b/wxPython/contrib/stc/msw/stc_.py index 2a0d4627c4..d526f8faa3 100644 --- a/wxPython/contrib/stc/msw/stc_.py +++ b/wxPython/contrib/stc/msw/stc_.py @@ -984,11 +984,11 @@ class wxStyledTextCtrlPtr(wxControlPtr): def GetMouseDownCaptures(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_GetMouseDownCaptures(self, *_args, **_kwargs) return val - def SetCursor(self, *_args, **_kwargs): - val = stc_c.wxStyledTextCtrl_SetCursor(self, *_args, **_kwargs) + def SetSTCCursor(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_SetSTCCursor(self, *_args, **_kwargs) return val - def GetCursor(self, *_args, **_kwargs): - val = stc_c.wxStyledTextCtrl_GetCursor(self, *_args, **_kwargs) + def GetSTCCursor(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_GetSTCCursor(self, *_args, **_kwargs) return val def SetControlCharSymbol(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_SetControlCharSymbol(self, *_args, **_kwargs) @@ -1135,6 +1135,12 @@ class wxStyledTextCtrlPtr(wxControlPtr): def LoadFile(self, *_args, **_kwargs): val = stc_c.wxStyledTextCtrl_LoadFile(self, *_args, **_kwargs) return val + def DoDragOver(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_DoDragOver(self, *_args, **_kwargs) + return val + def DoDropText(self, *_args, **_kwargs): + val = stc_c.wxStyledTextCtrl_DoDropText(self, *_args, **_kwargs) + return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxStyledTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxStyledTextCtrl(wxStyledTextCtrlPtr): @@ -1307,6 +1313,7 @@ class wxStyledTextEvent(wxStyledTextEventPtr): #-------------- VARIABLE WRAPPERS ------------------ +STC_USE_DND = stc_c.STC_USE_DND wxSTC_USE_POPUP = stc_c.wxSTC_USE_POPUP wxSTC_INVALID_POSITION = stc_c.wxSTC_INVALID_POSITION wxSTC_START = stc_c.wxSTC_START @@ -1394,6 +1401,7 @@ wxSTC_INDIC_SQUIGGLE = stc_c.wxSTC_INDIC_SQUIGGLE wxSTC_INDIC_TT = stc_c.wxSTC_INDIC_TT wxSTC_INDIC_DIAGONAL = stc_c.wxSTC_INDIC_DIAGONAL wxSTC_INDIC_STRIKE = stc_c.wxSTC_INDIC_STRIKE +wxSTC_INDIC_HIDDEN = stc_c.wxSTC_INDIC_HIDDEN wxSTC_INDIC0_MASK = stc_c.wxSTC_INDIC0_MASK wxSTC_INDIC1_MASK = stc_c.wxSTC_INDIC1_MASK wxSTC_INDIC2_MASK = stc_c.wxSTC_INDIC2_MASK @@ -1440,6 +1448,7 @@ wxSTC_CARET_SLOP = stc_c.wxSTC_CARET_SLOP wxSTC_CARET_STRICT = stc_c.wxSTC_CARET_STRICT wxSTC_CARET_JUMPS = stc_c.wxSTC_CARET_JUMPS wxSTC_CARET_EVEN = stc_c.wxSTC_CARET_EVEN +wxSTC_KEYWORDSET_MAX = stc_c.wxSTC_KEYWORDSET_MAX wxSTC_MOD_INSERTTEXT = stc_c.wxSTC_MOD_INSERTTEXT wxSTC_MOD_DELETETEXT = stc_c.wxSTC_MOD_DELETETEXT wxSTC_MOD_CHANGESTYLE = stc_c.wxSTC_MOD_CHANGESTYLE @@ -1514,6 +1523,9 @@ wxSTC_LEX_CSS = stc_c.wxSTC_LEX_CSS wxSTC_LEX_POV = stc_c.wxSTC_LEX_POV wxSTC_LEX_LOUT = stc_c.wxSTC_LEX_LOUT wxSTC_LEX_ESCRIPT = stc_c.wxSTC_LEX_ESCRIPT +wxSTC_LEX_PS = stc_c.wxSTC_LEX_PS +wxSTC_LEX_NSIS = stc_c.wxSTC_LEX_NSIS +wxSTC_LEX_MMIXAL = stc_c.wxSTC_LEX_MMIXAL wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE @@ -1726,6 +1738,8 @@ wxSTC_LUA_WORD3 = stc_c.wxSTC_LUA_WORD3 wxSTC_LUA_WORD4 = stc_c.wxSTC_LUA_WORD4 wxSTC_LUA_WORD5 = stc_c.wxSTC_LUA_WORD5 wxSTC_LUA_WORD6 = stc_c.wxSTC_LUA_WORD6 +wxSTC_LUA_WORD7 = stc_c.wxSTC_LUA_WORD7 +wxSTC_LUA_WORD8 = stc_c.wxSTC_LUA_WORD8 wxSTC_ERR_DEFAULT = stc_c.wxSTC_ERR_DEFAULT wxSTC_ERR_PYTHON = stc_c.wxSTC_ERR_PYTHON wxSTC_ERR_GCC = stc_c.wxSTC_ERR_GCC @@ -1913,14 +1927,20 @@ wxSTC_CSS_SINGLESTRING = stc_c.wxSTC_CSS_SINGLESTRING wxSTC_POV_DEFAULT = stc_c.wxSTC_POV_DEFAULT wxSTC_POV_COMMENT = stc_c.wxSTC_POV_COMMENT wxSTC_POV_COMMENTLINE = stc_c.wxSTC_POV_COMMENTLINE -wxSTC_POV_COMMENTDOC = stc_c.wxSTC_POV_COMMENTDOC wxSTC_POV_NUMBER = stc_c.wxSTC_POV_NUMBER -wxSTC_POV_WORD = stc_c.wxSTC_POV_WORD -wxSTC_POV_STRING = stc_c.wxSTC_POV_STRING wxSTC_POV_OPERATOR = stc_c.wxSTC_POV_OPERATOR wxSTC_POV_IDENTIFIER = stc_c.wxSTC_POV_IDENTIFIER -wxSTC_POV_BRACE = stc_c.wxSTC_POV_BRACE +wxSTC_POV_STRING = stc_c.wxSTC_POV_STRING +wxSTC_POV_STRINGEOL = stc_c.wxSTC_POV_STRINGEOL +wxSTC_POV_DIRECTIVE = stc_c.wxSTC_POV_DIRECTIVE +wxSTC_POV_BADDIRECTIVE = stc_c.wxSTC_POV_BADDIRECTIVE wxSTC_POV_WORD2 = stc_c.wxSTC_POV_WORD2 +wxSTC_POV_WORD3 = stc_c.wxSTC_POV_WORD3 +wxSTC_POV_WORD4 = stc_c.wxSTC_POV_WORD4 +wxSTC_POV_WORD5 = stc_c.wxSTC_POV_WORD5 +wxSTC_POV_WORD6 = stc_c.wxSTC_POV_WORD6 +wxSTC_POV_WORD7 = stc_c.wxSTC_POV_WORD7 +wxSTC_POV_WORD8 = stc_c.wxSTC_POV_WORD8 wxSTC_LOUT_DEFAULT = stc_c.wxSTC_LOUT_DEFAULT wxSTC_LOUT_COMMENT = stc_c.wxSTC_LOUT_COMMENT wxSTC_LOUT_NUMBER = stc_c.wxSTC_LOUT_NUMBER @@ -1944,6 +1964,54 @@ wxSTC_ESCRIPT_IDENTIFIER = stc_c.wxSTC_ESCRIPT_IDENTIFIER wxSTC_ESCRIPT_BRACE = stc_c.wxSTC_ESCRIPT_BRACE wxSTC_ESCRIPT_WORD2 = stc_c.wxSTC_ESCRIPT_WORD2 wxSTC_ESCRIPT_WORD3 = stc_c.wxSTC_ESCRIPT_WORD3 +wxSTC_PS_DEFAULT = stc_c.wxSTC_PS_DEFAULT +wxSTC_PS_COMMENT = stc_c.wxSTC_PS_COMMENT +wxSTC_PS_DSC_COMMENT = stc_c.wxSTC_PS_DSC_COMMENT +wxSTC_PS_DSC_VALUE = stc_c.wxSTC_PS_DSC_VALUE +wxSTC_PS_NUMBER = stc_c.wxSTC_PS_NUMBER +wxSTC_PS_NAME = stc_c.wxSTC_PS_NAME +wxSTC_PS_KEYWORD = stc_c.wxSTC_PS_KEYWORD +wxSTC_PS_LITERAL = stc_c.wxSTC_PS_LITERAL +wxSTC_PS_IMMEVAL = stc_c.wxSTC_PS_IMMEVAL +wxSTC_PS_PAREN_ARRAY = stc_c.wxSTC_PS_PAREN_ARRAY +wxSTC_PS_PAREN_DICT = stc_c.wxSTC_PS_PAREN_DICT +wxSTC_PS_PAREN_PROC = stc_c.wxSTC_PS_PAREN_PROC +wxSTC_PS_TEXT = stc_c.wxSTC_PS_TEXT +wxSTC_PS_HEXSTRING = stc_c.wxSTC_PS_HEXSTRING +wxSTC_PS_BASE85STRING = stc_c.wxSTC_PS_BASE85STRING +wxSTC_PS_BADSTRINGCHAR = stc_c.wxSTC_PS_BADSTRINGCHAR +wxSTC_NSIS_DEFAULT = stc_c.wxSTC_NSIS_DEFAULT +wxSTC_NSIS_COMMENT = stc_c.wxSTC_NSIS_COMMENT +wxSTC_NSIS_STRINGDQ = stc_c.wxSTC_NSIS_STRINGDQ +wxSTC_NSIS_STRINGLQ = stc_c.wxSTC_NSIS_STRINGLQ +wxSTC_NSIS_STRINGRQ = stc_c.wxSTC_NSIS_STRINGRQ +wxSTC_NSIS_FUNCTION = stc_c.wxSTC_NSIS_FUNCTION +wxSTC_NSIS_VARIABLE = stc_c.wxSTC_NSIS_VARIABLE +wxSTC_NSIS_LABEL = stc_c.wxSTC_NSIS_LABEL +wxSTC_NSIS_USERDEFINED = stc_c.wxSTC_NSIS_USERDEFINED +wxSTC_NSIS_SECTIONDEF = stc_c.wxSTC_NSIS_SECTIONDEF +wxSTC_NSIS_SUBSECTIONDEF = stc_c.wxSTC_NSIS_SUBSECTIONDEF +wxSTC_NSIS_IFDEFINEDEF = stc_c.wxSTC_NSIS_IFDEFINEDEF +wxSTC_NSIS_MACRODEF = stc_c.wxSTC_NSIS_MACRODEF +wxSTC_NSIS_STRINGVAR = stc_c.wxSTC_NSIS_STRINGVAR +wxSTC_MMIXAL_LEADWS = stc_c.wxSTC_MMIXAL_LEADWS +wxSTC_MMIXAL_COMMENT = stc_c.wxSTC_MMIXAL_COMMENT +wxSTC_MMIXAL_LABEL = stc_c.wxSTC_MMIXAL_LABEL +wxSTC_MMIXAL_OPCODE = stc_c.wxSTC_MMIXAL_OPCODE +wxSTC_MMIXAL_OPCODE_PRE = stc_c.wxSTC_MMIXAL_OPCODE_PRE +wxSTC_MMIXAL_OPCODE_VALID = stc_c.wxSTC_MMIXAL_OPCODE_VALID +wxSTC_MMIXAL_OPCODE_UNKNOWN = stc_c.wxSTC_MMIXAL_OPCODE_UNKNOWN +wxSTC_MMIXAL_OPCODE_POST = stc_c.wxSTC_MMIXAL_OPCODE_POST +wxSTC_MMIXAL_OPERANDS = stc_c.wxSTC_MMIXAL_OPERANDS +wxSTC_MMIXAL_NUMBER = stc_c.wxSTC_MMIXAL_NUMBER +wxSTC_MMIXAL_REF = stc_c.wxSTC_MMIXAL_REF +wxSTC_MMIXAL_CHAR = stc_c.wxSTC_MMIXAL_CHAR +wxSTC_MMIXAL_STRING = stc_c.wxSTC_MMIXAL_STRING +wxSTC_MMIXAL_REGISTER = stc_c.wxSTC_MMIXAL_REGISTER +wxSTC_MMIXAL_HEX = stc_c.wxSTC_MMIXAL_HEX +wxSTC_MMIXAL_OPERATOR = stc_c.wxSTC_MMIXAL_OPERATOR +wxSTC_MMIXAL_SYMBOL = stc_c.wxSTC_MMIXAL_SYMBOL +wxSTC_MMIXAL_INCLUDE = stc_c.wxSTC_MMIXAL_INCLUDE wxSTC_CMD_REDO = stc_c.wxSTC_CMD_REDO wxSTC_CMD_SELECTALL = stc_c.wxSTC_CMD_SELECTALL wxSTC_CMD_UNDO = stc_c.wxSTC_CMD_UNDO @@ -2017,7 +2085,6 @@ wxSTC_CMD_PARADOWN = stc_c.wxSTC_CMD_PARADOWN wxSTC_CMD_PARADOWNEXTEND = stc_c.wxSTC_CMD_PARADOWNEXTEND wxSTC_CMD_PARAUP = stc_c.wxSTC_CMD_PARAUP wxSTC_CMD_PARAUPEXTEND = stc_c.wxSTC_CMD_PARAUPEXTEND -STC_USE_DND = stc_c.STC_USE_DND wxEVT_STC_CHANGE = stc_c.wxEVT_STC_CHANGE wxEVT_STC_STYLENEEDED = stc_c.wxEVT_STC_STYLENEEDED wxEVT_STC_CHARADDED = stc_c.wxEVT_STC_CHARADDED diff --git a/wxPython/src/msw/controls.cpp b/wxPython/src/msw/controls.cpp index 22e9d12c77..fa7d6d7434 100644 --- a/wxPython/src/msw/controls.cpp +++ b/wxPython/src/msw/controls.cpp @@ -2257,6 +2257,119 @@ static PyObject *_wrap_wxCheckBox_SetValue(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxCheckBox_Get3StateValue(_swigobj) (_swigobj->Get3StateValue()) +static PyObject *_wrap_wxCheckBox_Get3StateValue(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCheckBoxState _result; + wxCheckBox * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCheckBox_Get3StateValue",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_Get3StateValue. Expected _wxCheckBox_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxCheckBoxState )wxCheckBox_Get3StateValue(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxCheckBox_Set3StateValue(_swigobj,_swigarg0) (_swigobj->Set3StateValue(_swigarg0)) +static PyObject *_wrap_wxCheckBox_Set3StateValue(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCheckBox * _arg0; + wxCheckBoxState _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","state", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCheckBox_Set3StateValue",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_Set3StateValue. Expected _wxCheckBox_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxCheckBox_Set3StateValue(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxCheckBox_Is3State(_swigobj) (_swigobj->Is3State()) +static PyObject *_wrap_wxCheckBox_Is3State(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxCheckBox * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCheckBox_Is3State",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_Is3State. Expected _wxCheckBox_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxCheckBox_Is3State(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxCheckBox_Is3rdStateAllowedForUser(_swigobj) (_swigobj->Is3rdStateAllowedForUser()) +static PyObject *_wrap_wxCheckBox_Is3rdStateAllowedForUser(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxCheckBox * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCheckBox_Is3rdStateAllowedForUser",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCheckBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckBox_Is3rdStateAllowedForUser. Expected _wxCheckBox_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxCheckBox_Is3rdStateAllowedForUser(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxChoiceTowxControlWithItems(void *ptr) { wxChoice *src; wxControlWithItems *dest; @@ -3760,6 +3873,34 @@ static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args, PyObject return _resultobj; } +#define wxGauge_IsVertical(_swigobj) (_swigobj->IsVertical()) +static PyObject *_wrap_wxGauge_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxGauge * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_IsVertical",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_IsVertical. Expected _wxGauge_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxGauge_IsVertical(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGauge_SetBezelFace(_swigobj,_swigarg0) (_swigobj->SetBezelFace(_swigarg0)) static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -7423,6 +7564,34 @@ static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxTextCtrl_MarkDirty(_swigobj) (_swigobj->MarkDirty()) +static PyObject *_wrap_wxTextCtrl_MarkDirty(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTextCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_MarkDirty",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_MarkDirty. Expected _wxTextCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTextCtrl_MarkDirty(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxTextCtrl_DiscardEdits(_swigobj) (_swigobj->DiscardEdits()) static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -12211,6 +12380,7 @@ static PyMethodDef controlscMethods[] = { { "wxTextCtrl_WriteText", (PyCFunction) _wrap_wxTextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_SetMaxLength", (PyCFunction) _wrap_wxTextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_DiscardEdits", (PyCFunction) _wrap_wxTextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS }, + { "wxTextCtrl_MarkDirty", (PyCFunction) _wrap_wxTextCtrl_MarkDirty, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_SaveFile", (PyCFunction) _wrap_wxTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_LoadFile", (PyCFunction) _wrap_wxTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS }, { "wxTextCtrl_Remove", (PyCFunction) _wrap_wxTextCtrl_Remove, METH_VARARGS | METH_KEYWORDS }, @@ -12297,6 +12467,7 @@ static PyMethodDef controlscMethods[] = { { "wxGauge_SetShadowWidth", (PyCFunction) _wrap_wxGauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS }, { "wxGauge_SetRange", (PyCFunction) _wrap_wxGauge_SetRange, METH_VARARGS | METH_KEYWORDS }, { "wxGauge_SetBezelFace", (PyCFunction) _wrap_wxGauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS }, + { "wxGauge_IsVertical", (PyCFunction) _wrap_wxGauge_IsVertical, METH_VARARGS | METH_KEYWORDS }, { "wxGauge_GetValue", (PyCFunction) _wrap_wxGauge_GetValue, METH_VARARGS | METH_KEYWORDS }, { "wxGauge_GetShadowWidth", (PyCFunction) _wrap_wxGauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS }, { "wxGauge_GetRange", (PyCFunction) _wrap_wxGauge_GetRange, METH_VARARGS | METH_KEYWORDS }, @@ -12330,6 +12501,10 @@ static PyMethodDef controlscMethods[] = { { "wxChoice_Create", (PyCFunction) _wrap_wxChoice_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreChoice", (PyCFunction) _wrap_new_wxPreChoice, METH_VARARGS | METH_KEYWORDS }, { "new_wxChoice", (PyCFunction) _wrap_new_wxChoice, METH_VARARGS | METH_KEYWORDS }, + { "wxCheckBox_Is3rdStateAllowedForUser", (PyCFunction) _wrap_wxCheckBox_Is3rdStateAllowedForUser, METH_VARARGS | METH_KEYWORDS }, + { "wxCheckBox_Is3State", (PyCFunction) _wrap_wxCheckBox_Is3State, METH_VARARGS | METH_KEYWORDS }, + { "wxCheckBox_Set3StateValue", (PyCFunction) _wrap_wxCheckBox_Set3StateValue, METH_VARARGS | METH_KEYWORDS }, + { "wxCheckBox_Get3StateValue", (PyCFunction) _wrap_wxCheckBox_Get3StateValue, METH_VARARGS | METH_KEYWORDS }, { "wxCheckBox_SetValue", (PyCFunction) _wrap_wxCheckBox_SetValue, METH_VARARGS | METH_KEYWORDS }, { "wxCheckBox_IsChecked", (PyCFunction) _wrap_wxCheckBox_IsChecked, METH_VARARGS | METH_KEYWORDS }, { "wxCheckBox_GetValue", (PyCFunction) _wrap_wxCheckBox_GetValue, METH_VARARGS | METH_KEYWORDS }, @@ -12588,6 +12763,12 @@ SWIGEXPORT(void) initcontrolsc() { d = PyModule_GetDict(m); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxDefaultValidator",_wrap_wxDefaultValidator_get, _wrap_wxDefaultValidator_set); + PyDict_SetItemString(d,"wxCHK_2STATE", PyInt_FromLong((long) wxCHK_2STATE)); + PyDict_SetItemString(d,"wxCHK_3STATE", PyInt_FromLong((long) wxCHK_3STATE)); + PyDict_SetItemString(d,"wxCHK_ALLOW_3RD_STATE_FOR_USER", PyInt_FromLong((long) wxCHK_ALLOW_3RD_STATE_FOR_USER)); + PyDict_SetItemString(d,"wxCHK_UNCHECKED", PyInt_FromLong((long) wxCHK_UNCHECKED)); + PyDict_SetItemString(d,"wxCHK_CHECKED", PyInt_FromLong((long) wxCHK_CHECKED)); + PyDict_SetItemString(d,"wxCHK_UNDETERMINED", PyInt_FromLong((long) wxCHK_UNDETERMINED)); PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL)); PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL)); PyDict_SetItemString(d,"wxTE_READONLY", PyInt_FromLong((long) wxTE_READONLY)); diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py index 61f799a140..e05535730b 100644 --- a/wxPython/src/msw/controls.py +++ b/wxPython/src/msw/controls.py @@ -212,6 +212,18 @@ class wxCheckBoxPtr(wxControlPtr): def SetValue(self, *_args, **_kwargs): val = controlsc.wxCheckBox_SetValue(self, *_args, **_kwargs) return val + def Get3StateValue(self, *_args, **_kwargs): + val = controlsc.wxCheckBox_Get3StateValue(self, *_args, **_kwargs) + return val + def Set3StateValue(self, *_args, **_kwargs): + val = controlsc.wxCheckBox_Set3StateValue(self, *_args, **_kwargs) + return val + def Is3State(self, *_args, **_kwargs): + val = controlsc.wxCheckBox_Is3State(self, *_args, **_kwargs) + return val + def Is3rdStateAllowedForUser(self, *_args, **_kwargs): + val = controlsc.wxCheckBox_Is3rdStateAllowedForUser(self, *_args, **_kwargs) + return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxCheckBox(wxCheckBoxPtr): @@ -359,6 +371,9 @@ class wxGaugePtr(wxControlPtr): def GetValue(self, *_args, **_kwargs): val = controlsc.wxGauge_GetValue(self, *_args, **_kwargs) return val + def IsVertical(self, *_args, **_kwargs): + val = controlsc.wxGauge_IsVertical(self, *_args, **_kwargs) + return val def SetBezelFace(self, *_args, **_kwargs): val = controlsc.wxGauge_SetBezelFace(self, *_args, **_kwargs) return val @@ -721,6 +736,9 @@ class wxTextCtrlPtr(wxControlPtr): def SaveFile(self, *_args, **_kwargs): val = controlsc.wxTextCtrl_SaveFile(self, *_args, **_kwargs) return val + def MarkDirty(self, *_args, **_kwargs): + val = controlsc.wxTextCtrl_MarkDirty(self, *_args, **_kwargs) + return val def DiscardEdits(self, *_args, **_kwargs): val = controlsc.wxTextCtrl_DiscardEdits(self, *_args, **_kwargs) return val @@ -1239,6 +1257,12 @@ def wxTextAttr_Combine(*_args, **_kwargs): cvar = controlsc.cvar wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator) +wxCHK_2STATE = controlsc.wxCHK_2STATE +wxCHK_3STATE = controlsc.wxCHK_3STATE +wxCHK_ALLOW_3RD_STATE_FOR_USER = controlsc.wxCHK_ALLOW_3RD_STATE_FOR_USER +wxCHK_UNCHECKED = controlsc.wxCHK_UNCHECKED +wxCHK_CHECKED = controlsc.wxCHK_CHECKED +wxCHK_UNDETERMINED = controlsc.wxCHK_UNDETERMINED wxTE_NO_VSCROLL = controlsc.wxTE_NO_VSCROLL wxTE_AUTO_SCROLL = controlsc.wxTE_AUTO_SCROLL wxTE_READONLY = controlsc.wxTE_READONLY diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp index 0802230f15..5c9dc744e8 100644 --- a/wxPython/src/msw/controls2.cpp +++ b/wxPython/src/msw/controls2.cpp @@ -2655,6 +2655,65 @@ static PyObject *_wrap_wxListEvent_GetCacheTo(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxListEvent_IsEditCancelled(_swigobj) (_swigobj->IsEditCancelled()) +static PyObject *_wrap_wxListEvent_IsEditCancelled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxListEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_IsEditCancelled",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_IsEditCancelled. Expected _wxListEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxListEvent_IsEditCancelled(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxListEvent_SetEditCanceled(_swigobj,_swigarg0) (_swigobj->SetEditCanceled(_swigarg0)) +static PyObject *_wrap_wxListEvent_SetEditCanceled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxListEvent * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","editCancelled", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListEvent_SetEditCanceled",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_SetEditCanceled. Expected _wxListEvent_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxListEvent_SetEditCanceled(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxPyListCtrlTowxControl(void *ptr) { wxPyListCtrl *src; wxControl *dest; @@ -3135,6 +3194,36 @@ static PyObject *_wrap_wxListCtrl_GetCountPerPage(PyObject *self, PyObject *args return _resultobj; } +#define wxListCtrl_GetViewRect(_swigobj) (_swigobj->GetViewRect()) +static PyObject *_wrap_wxListCtrl_GetViewRect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxRect * _result; + wxPyListCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetViewRect",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyListCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetViewRect. Expected _wxPyListCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxRect (wxListCtrl_GetViewRect(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxListCtrl_GetEditControl(_swigobj) (_swigobj->GetEditControl()) static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3681,18 +3770,17 @@ static PyObject *_wrap_wxListCtrl_GetColumnCount(PyObject *self, PyObject *args, return _resultobj; } -#define wxListCtrl_GetItemSpacing(_swigobj,_swigarg0) (_swigobj->GetItemSpacing(_swigarg0)) +#define wxListCtrl_GetItemSpacing(_swigobj) (_swigobj->GetItemSpacing()) static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; + wxSize * _result; wxPyListCtrl * _arg0; - bool _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","isSmall", NULL }; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_GetItemSpacing",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetItemSpacing",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3701,14 +3789,14 @@ static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args, return NULL; } } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxListCtrl_GetItemSpacing(_arg0,_arg1); + _result = new wxSize (wxListCtrl_GetItemSpacing(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -11400,6 +11488,7 @@ static PyMethodDef controls2cMethods[] = { { "wxListCtrl_SetItem", (PyCFunction) _wrap_wxListCtrl_SetItem, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_GetItem", (PyCFunction) _wrap_wxListCtrl_GetItem, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_GetEditControl", (PyCFunction) _wrap_wxListCtrl_GetEditControl, METH_VARARGS | METH_KEYWORDS }, + { "wxListCtrl_GetViewRect", (PyCFunction) _wrap_wxListCtrl_GetViewRect, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_GetCountPerPage", (PyCFunction) _wrap_wxListCtrl_GetCountPerPage, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_SetColumnWidth", (PyCFunction) _wrap_wxListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS }, { "wxListCtrl_GetColumnWidth", (PyCFunction) _wrap_wxListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS }, @@ -11411,6 +11500,8 @@ static PyMethodDef controls2cMethods[] = { { "wxListCtrl_Create", (PyCFunction) _wrap_wxListCtrl_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreListCtrl", (PyCFunction) _wrap_new_wxPreListCtrl, METH_VARARGS | METH_KEYWORDS }, { "new_wxListCtrl", (PyCFunction) _wrap_new_wxListCtrl, METH_VARARGS | METH_KEYWORDS }, + { "wxListEvent_SetEditCanceled", (PyCFunction) _wrap_wxListEvent_SetEditCanceled, METH_VARARGS | METH_KEYWORDS }, + { "wxListEvent_IsEditCancelled", (PyCFunction) _wrap_wxListEvent_IsEditCancelled, METH_VARARGS | METH_KEYWORDS }, { "wxListEvent_GetCacheTo", (PyCFunction) _wrap_wxListEvent_GetCacheTo, METH_VARARGS | METH_KEYWORDS }, { "wxListEvent_GetCacheFrom", (PyCFunction) _wrap_wxListEvent_GetCacheFrom, METH_VARARGS | METH_KEYWORDS }, { "wxListEvent_GetItem", (PyCFunction) _wrap_wxListEvent_GetItem, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py index 846605012c..b8cdf7b9ed 100644 --- a/wxPython/src/msw/controls2.py +++ b/wxPython/src/msw/controls2.py @@ -392,6 +392,12 @@ class wxListEventPtr(wxNotifyEventPtr): def GetCacheTo(self, *_args, **_kwargs): val = controls2c.wxListEvent_GetCacheTo(self, *_args, **_kwargs) return val + def IsEditCancelled(self, *_args, **_kwargs): + val = controls2c.wxListEvent_IsEditCancelled(self, *_args, **_kwargs) + return val + def SetEditCanceled(self, *_args, **_kwargs): + val = controls2c.wxListEvent_SetEditCanceled(self, *_args, **_kwargs) + return val def __setattr__(self,name,value): if name == "m_code" : controls2c.wxListEvent_m_code_set(self,value) @@ -468,6 +474,10 @@ class wxListCtrlPtr(wxControlPtr): def GetCountPerPage(self, *_args, **_kwargs): val = controls2c.wxListCtrl_GetCountPerPage(self, *_args, **_kwargs) return val + def GetViewRect(self, *_args, **_kwargs): + val = controls2c.wxListCtrl_GetViewRect(self, *_args, **_kwargs) + if val: val = wxRectPtr(val) ; val.thisown = 1 + return val def GetEditControl(self, *_args, **_kwargs): val = controls2c.wxListCtrl_GetEditControl(self, *_args, **_kwargs) return val @@ -520,6 +530,7 @@ class wxListCtrlPtr(wxControlPtr): return val def GetItemSpacing(self, *_args, **_kwargs): val = controls2c.wxListCtrl_GetItemSpacing(self, *_args, **_kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 return val def GetSelectedItemCount(self, *_args, **_kwargs): val = controls2c.wxListCtrl_GetSelectedItemCount(self, *_args, **_kwargs) diff --git a/wxPython/src/msw/events.cpp b/wxPython/src/msw/events.cpp index d62da54e61..745eff7e9c 100644 --- a/wxPython/src/msw/events.cpp +++ b/wxPython/src/msw/events.cpp @@ -140,31 +140,32 @@ static PyObject *_wrap_delete_wxEvent(PyObject *self, PyObject *args, PyObject * return _resultobj; } -#define wxEvent_GetEventObject(_swigobj) (_swigobj->GetEventObject()) -static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxEvent_SetEventType(_swigobj,_swigarg0) (_swigobj->SetEventType(_swigarg0)) +static PyObject *_wrap_wxEvent_SetEventType(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxObject * _result; wxEvent * _arg0; + wxEventType _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","typ", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetEventObject",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxEvent_SetEventType",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetEventObject. Expected _wxEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventType. Expected _wxEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxObject *)wxEvent_GetEventObject(_arg0); + wxEvent_SetEventType(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } @@ -196,31 +197,68 @@ static PyObject *_wrap_wxEvent_GetEventType(PyObject *self, PyObject *args, PyOb return _resultobj; } -#define wxEvent_GetId(_swigobj) (_swigobj->GetId()) -static PyObject *_wrap_wxEvent_GetId(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxEvent_GetEventObject(_swigobj) (_swigobj->GetEventObject()) +static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; + wxObject * _result; wxEvent * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetId",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetEventObject",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetId. Expected _wxEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetEventObject. Expected _wxEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxEvent_GetId(_arg0); + _result = (wxObject *)wxEvent_GetEventObject(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; +} + +#define wxEvent_SetEventObject(_swigobj,_swigarg0) (_swigobj->SetEventObject(_swigarg0)) +static PyObject *_wrap_wxEvent_SetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvent * _arg0; + wxObject * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","obj", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxEvent_SetEventObject",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventObject. Expected _wxEvent_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxObject_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvent_SetEventObject. Expected _wxObject_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxEvent_SetEventObject(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } @@ -252,35 +290,27 @@ static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *self, PyObject *args, PyOb return _resultobj; } -#define wxEvent_SetEventObject(_swigobj,_swigarg0) (_swigobj->SetEventObject(_swigarg0)) -static PyObject *_wrap_wxEvent_SetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxEvent_SetTimestamp(_swigobj,_swigarg0) (_swigobj->SetTimestamp(_swigarg0)) +static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxEvent * _arg0; - wxObject * _arg1; + long _arg1 = (long ) 0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","object", NULL }; + char *_kwnames[] = { "self","ts", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxEvent_SetEventObject",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|l:wxEvent_SetTimestamp",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventObject. Expected _wxEvent_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxObject_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvent_SetEventObject. Expected _wxObject_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetTimestamp. Expected _wxEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxEvent_SetEventObject(_arg0,_arg1); + wxEvent_SetTimestamp(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -289,32 +319,31 @@ static PyObject *_wrap_wxEvent_SetEventObject(PyObject *self, PyObject *args, Py return _resultobj; } -#define wxEvent_SetEventType(_swigobj,_swigarg0) (_swigobj->SetEventType(_swigarg0)) -static PyObject *_wrap_wxEvent_SetEventType(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxEvent_GetId(_swigobj) (_swigobj->GetId()) +static PyObject *_wrap_wxEvent_GetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + int _result; wxEvent * _arg0; - wxEventType _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","typ", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxEvent_SetEventType",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetId",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetEventType. Expected _wxEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_GetId. Expected _wxEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxEvent_SetEventType(_arg0,_arg1); + _result = (int )wxEvent_GetId(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -324,7 +353,7 @@ static PyObject *_wrap_wxEvent_SetId(PyObject *self, PyObject *args, PyObject *k wxEvent * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","id", NULL }; + char *_kwnames[] = { "self","Id", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxEvent_SetId",_kwnames,&_argo0,&_arg1)) @@ -347,35 +376,6 @@ static PyObject *_wrap_wxEvent_SetId(PyObject *self, PyObject *args, PyObject *k return _resultobj; } -#define wxEvent_SetTimestamp(_swigobj,_swigarg0) (_swigobj->SetTimestamp(_swigarg0)) -static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxEvent * _arg0; - long _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","timeStamp", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxEvent_SetTimestamp",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvent_SetTimestamp. Expected _wxEvent_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxEvent_SetTimestamp(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - #define wxEvent_IsCommandEvent(_swigobj) (_swigobj->IsCommandEvent()) static PyObject *_wrap_wxEvent_IsCommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -8511,14 +8511,14 @@ static PyMethodDef eventscMethods[] = { { "wxEvent_GetSkipped", (PyCFunction) _wrap_wxEvent_GetSkipped, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_Skip", (PyCFunction) _wrap_wxEvent_Skip, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_IsCommandEvent", (PyCFunction) _wrap_wxEvent_IsCommandEvent, METH_VARARGS | METH_KEYWORDS }, - { "wxEvent_SetTimestamp", (PyCFunction) _wrap_wxEvent_SetTimestamp, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_SetId", (PyCFunction) _wrap_wxEvent_SetId, METH_VARARGS | METH_KEYWORDS }, - { "wxEvent_SetEventType", (PyCFunction) _wrap_wxEvent_SetEventType, METH_VARARGS | METH_KEYWORDS }, - { "wxEvent_SetEventObject", (PyCFunction) _wrap_wxEvent_SetEventObject, METH_VARARGS | METH_KEYWORDS }, - { "wxEvent_GetTimestamp", (PyCFunction) _wrap_wxEvent_GetTimestamp, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_GetId", (PyCFunction) _wrap_wxEvent_GetId, METH_VARARGS | METH_KEYWORDS }, - { "wxEvent_GetEventType", (PyCFunction) _wrap_wxEvent_GetEventType, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_SetTimestamp", (PyCFunction) _wrap_wxEvent_SetTimestamp, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_GetTimestamp", (PyCFunction) _wrap_wxEvent_GetTimestamp, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_SetEventObject", (PyCFunction) _wrap_wxEvent_SetEventObject, METH_VARARGS | METH_KEYWORDS }, { "wxEvent_GetEventObject", (PyCFunction) _wrap_wxEvent_GetEventObject, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_GetEventType", (PyCFunction) _wrap_wxEvent_GetEventType, METH_VARARGS | METH_KEYWORDS }, + { "wxEvent_SetEventType", (PyCFunction) _wrap_wxEvent_SetEventType, METH_VARARGS | METH_KEYWORDS }, { "delete_wxEvent", (PyCFunction) _wrap_delete_wxEvent, METH_VARARGS | METH_KEYWORDS }, { "wxNewEventType", (PyCFunction) _wrap_wxNewEventType, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } diff --git a/wxPython/src/msw/events.py b/wxPython/src/msw/events.py index 3505d67a41..6a07e75b46 100644 --- a/wxPython/src/msw/events.py +++ b/wxPython/src/msw/events.py @@ -16,30 +16,30 @@ class wxEventPtr(wxObjectPtr): delfunc(self) except: pass - def GetEventObject(self, *_args, **_kwargs): - val = eventsc.wxEvent_GetEventObject(self, *_args, **_kwargs) + def SetEventType(self, *_args, **_kwargs): + val = eventsc.wxEvent_SetEventType(self, *_args, **_kwargs) return val def GetEventType(self, *_args, **_kwargs): val = eventsc.wxEvent_GetEventType(self, *_args, **_kwargs) return val - def GetId(self, *_args, **_kwargs): - val = eventsc.wxEvent_GetId(self, *_args, **_kwargs) - return val - def GetTimestamp(self, *_args, **_kwargs): - val = eventsc.wxEvent_GetTimestamp(self, *_args, **_kwargs) + def GetEventObject(self, *_args, **_kwargs): + val = eventsc.wxEvent_GetEventObject(self, *_args, **_kwargs) return val def SetEventObject(self, *_args, **_kwargs): val = eventsc.wxEvent_SetEventObject(self, *_args, **_kwargs) return val - def SetEventType(self, *_args, **_kwargs): - val = eventsc.wxEvent_SetEventType(self, *_args, **_kwargs) - return val - def SetId(self, *_args, **_kwargs): - val = eventsc.wxEvent_SetId(self, *_args, **_kwargs) + def GetTimestamp(self, *_args, **_kwargs): + val = eventsc.wxEvent_GetTimestamp(self, *_args, **_kwargs) return val def SetTimestamp(self, *_args, **_kwargs): val = eventsc.wxEvent_SetTimestamp(self, *_args, **_kwargs) return val + def GetId(self, *_args, **_kwargs): + val = eventsc.wxEvent_GetId(self, *_args, **_kwargs) + return val + def SetId(self, *_args, **_kwargs): + val = eventsc.wxEvent_SetId(self, *_args, **_kwargs) + return val def IsCommandEvent(self, *_args, **_kwargs): val = eventsc.wxEvent_IsCommandEvent(self, *_args, **_kwargs) return val diff --git a/wxPython/src/msw/fonts.cpp b/wxPython/src/msw/fonts.cpp index 2d18304dc6..081e46adc6 100644 --- a/wxPython/src/msw/fonts.cpp +++ b/wxPython/src/msw/fonts.cpp @@ -93,30 +93,30 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { static const wxString wxPyEmptyString(wxT("")); // Fix some link errors... Remove this when these methods get real implementations... -#if defined(__WXGTK__) || defined(__WXX11__) -#if wxUSE_PANGO -void wxNativeFontInfo::SetPointSize(int pointsize) - { wxFAIL_MSG( _T("not implemented") ); } +// #if defined(__WXGTK__) || defined(__WXX11__) +// #if wxUSE_PANGO +// void wxNativeFontInfo::SetPointSize(int pointsize) +// { wxFAIL_MSG( _T("not implemented") ); } -void wxNativeFontInfo::SetStyle(wxFontStyle style) - { wxFAIL_MSG( _T("not implemented") ); } +// void wxNativeFontInfo::SetStyle(wxFontStyle style) +// { wxFAIL_MSG( _T("not implemented") ); } -void wxNativeFontInfo::SetWeight(wxFontWeight weight) - { wxFAIL_MSG( _T("not implemented") ); } +// void wxNativeFontInfo::SetWeight(wxFontWeight weight) +// { wxFAIL_MSG( _T("not implemented") ); } -void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) - { wxFAIL_MSG( _T("not implemented") ); } +// void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) +// { wxFAIL_MSG( _T("not implemented") ); } -void wxNativeFontInfo::SetFaceName(wxString facename) - { wxFAIL_MSG( _T("not implemented") ); } +// void wxNativeFontInfo::SetFaceName(wxString facename) +// { wxFAIL_MSG( _T("not implemented") ); } -void wxNativeFontInfo::SetFamily(wxFontFamily family) - { wxFAIL_MSG( _T("not implemented") ); } +// void wxNativeFontInfo::SetFamily(wxFontFamily family) +// { wxFAIL_MSG( _T("not implemented") ); } -void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) - { wxFAIL_MSG( _T("not implemented") ); } -#endif -#endif +// void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) +// { wxFAIL_MSG( _T("not implemented") ); } +// #endif +// #endif class wxPyFontEnumerator : public wxFontEnumerator { public: @@ -252,6 +252,42 @@ static PyObject *_wrap_wxNativeFontInfo_Init(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxNativeFontInfo_InitFromFont(_swigobj,_swigarg0) (_swigobj->InitFromFont(_swigarg0)) +static PyObject *_wrap_wxNativeFontInfo_InitFromFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxNativeFontInfo * _arg0; + wxFont * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","font", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNativeFontInfo_InitFromFont",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNativeFontInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNativeFontInfo_InitFromFont. Expected _wxNativeFontInfo_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNativeFontInfo_InitFromFont. Expected _wxFont_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxNativeFontInfo_InitFromFont(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxNativeFontInfo_GetPointSize(_swigobj) (_swigobj->GetPointSize()) static PyObject *_wrap_wxNativeFontInfo_GetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -4029,6 +4065,7 @@ static PyMethodDef fontscMethods[] = { { "wxNativeFontInfo_GetWeight", (PyCFunction) _wrap_wxNativeFontInfo_GetWeight, METH_VARARGS | METH_KEYWORDS }, { "wxNativeFontInfo_GetStyle", (PyCFunction) _wrap_wxNativeFontInfo_GetStyle, METH_VARARGS | METH_KEYWORDS }, { "wxNativeFontInfo_GetPointSize", (PyCFunction) _wrap_wxNativeFontInfo_GetPointSize, METH_VARARGS | METH_KEYWORDS }, + { "wxNativeFontInfo_InitFromFont", (PyCFunction) _wrap_wxNativeFontInfo_InitFromFont, METH_VARARGS | METH_KEYWORDS }, { "wxNativeFontInfo_Init", (PyCFunction) _wrap_wxNativeFontInfo_Init, METH_VARARGS | METH_KEYWORDS }, { "new_wxNativeFontInfo", (PyCFunction) _wrap_new_wxNativeFontInfo, METH_VARARGS | METH_KEYWORDS }, { "wxGetTranslation", (PyCFunction) _wrap_wxGetTranslation, METH_VARARGS | METH_KEYWORDS }, @@ -4209,12 +4246,18 @@ SWIGEXPORT(void) initfontsc() { PyDict_SetItemString(d,"wxFONTENCODING_CP12_MAX", PyInt_FromLong((long) wxFONTENCODING_CP12_MAX)); PyDict_SetItemString(d,"wxFONTENCODING_UTF7", PyInt_FromLong((long) wxFONTENCODING_UTF7)); PyDict_SetItemString(d,"wxFONTENCODING_UTF8", PyInt_FromLong((long) wxFONTENCODING_UTF8)); + PyDict_SetItemString(d,"wxFONTENCODING_EUC_JP", PyInt_FromLong((long) wxFONTENCODING_EUC_JP)); + PyDict_SetItemString(d,"wxFONTENCODING_UTF16BE", PyInt_FromLong((long) wxFONTENCODING_UTF16BE)); + PyDict_SetItemString(d,"wxFONTENCODING_UTF16LE", PyInt_FromLong((long) wxFONTENCODING_UTF16LE)); + PyDict_SetItemString(d,"wxFONTENCODING_UTF32BE", PyInt_FromLong((long) wxFONTENCODING_UTF32BE)); + PyDict_SetItemString(d,"wxFONTENCODING_UTF32LE", PyInt_FromLong((long) wxFONTENCODING_UTF32LE)); + PyDict_SetItemString(d,"wxFONTENCODING_MAX", PyInt_FromLong((long) wxFONTENCODING_MAX)); PyDict_SetItemString(d,"wxFONTENCODING_GB2312", PyInt_FromLong((long) wxFONTENCODING_GB2312)); PyDict_SetItemString(d,"wxFONTENCODING_BIG5", PyInt_FromLong((long) wxFONTENCODING_BIG5)); PyDict_SetItemString(d,"wxFONTENCODING_SHIFT_JIS", PyInt_FromLong((long) wxFONTENCODING_SHIFT_JIS)); - PyDict_SetItemString(d,"wxFONTENCODING_EUC_JP", PyInt_FromLong((long) wxFONTENCODING_EUC_JP)); + PyDict_SetItemString(d,"wxFONTENCODING_UTF16", PyInt_FromLong((long) wxFONTENCODING_UTF16)); + PyDict_SetItemString(d,"wxFONTENCODING_UTF32", PyInt_FromLong((long) wxFONTENCODING_UTF32)); PyDict_SetItemString(d,"wxFONTENCODING_UNICODE", PyInt_FromLong((long) wxFONTENCODING_UNICODE)); - PyDict_SetItemString(d,"wxFONTENCODING_MAX", PyInt_FromLong((long) wxFONTENCODING_MAX)); PyDict_SetItemString(d,"wxLANGUAGE_DEFAULT", PyInt_FromLong((long) wxLANGUAGE_DEFAULT)); PyDict_SetItemString(d,"wxLANGUAGE_UNKNOWN", PyInt_FromLong((long) wxLANGUAGE_UNKNOWN)); PyDict_SetItemString(d,"wxLANGUAGE_ABKHAZIAN", PyInt_FromLong((long) wxLANGUAGE_ABKHAZIAN)); diff --git a/wxPython/src/msw/fonts.py b/wxPython/src/msw/fonts.py index e36477f30c..361cdcc5b6 100644 --- a/wxPython/src/msw/fonts.py +++ b/wxPython/src/msw/fonts.py @@ -9,6 +9,9 @@ class wxNativeFontInfoPtr : def Init(self, *_args, **_kwargs): val = fontsc.wxNativeFontInfo_Init(self, *_args, **_kwargs) return val + def InitFromFont(self, *_args, **_kwargs): + val = fontsc.wxNativeFontInfo_InitFromFont(self, *_args, **_kwargs) + return val def GetPointSize(self, *_args, **_kwargs): val = fontsc.wxNativeFontInfo_GetPointSize(self, *_args, **_kwargs) return val @@ -532,12 +535,18 @@ wxFONTENCODING_CP1257 = fontsc.wxFONTENCODING_CP1257 wxFONTENCODING_CP12_MAX = fontsc.wxFONTENCODING_CP12_MAX wxFONTENCODING_UTF7 = fontsc.wxFONTENCODING_UTF7 wxFONTENCODING_UTF8 = fontsc.wxFONTENCODING_UTF8 +wxFONTENCODING_EUC_JP = fontsc.wxFONTENCODING_EUC_JP +wxFONTENCODING_UTF16BE = fontsc.wxFONTENCODING_UTF16BE +wxFONTENCODING_UTF16LE = fontsc.wxFONTENCODING_UTF16LE +wxFONTENCODING_UTF32BE = fontsc.wxFONTENCODING_UTF32BE +wxFONTENCODING_UTF32LE = fontsc.wxFONTENCODING_UTF32LE +wxFONTENCODING_MAX = fontsc.wxFONTENCODING_MAX wxFONTENCODING_GB2312 = fontsc.wxFONTENCODING_GB2312 wxFONTENCODING_BIG5 = fontsc.wxFONTENCODING_BIG5 wxFONTENCODING_SHIFT_JIS = fontsc.wxFONTENCODING_SHIFT_JIS -wxFONTENCODING_EUC_JP = fontsc.wxFONTENCODING_EUC_JP +wxFONTENCODING_UTF16 = fontsc.wxFONTENCODING_UTF16 +wxFONTENCODING_UTF32 = fontsc.wxFONTENCODING_UTF32 wxFONTENCODING_UNICODE = fontsc.wxFONTENCODING_UNICODE -wxFONTENCODING_MAX = fontsc.wxFONTENCODING_MAX wxLANGUAGE_DEFAULT = fontsc.wxLANGUAGE_DEFAULT wxLANGUAGE_UNKNOWN = fontsc.wxLANGUAGE_UNKNOWN wxLANGUAGE_ABKHAZIAN = fontsc.wxLANGUAGE_ABKHAZIAN diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp index ac8ac7f28f..9c0e73cd7a 100644 --- a/wxPython/src/msw/gdi.cpp +++ b/wxPython/src/msw/gdi.cpp @@ -12132,7 +12132,38 @@ static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args, PyO return _resultobj; } +static bool wxRegionIterator___nonzero__(wxRegionIterator *self) { + return self->operator bool(); + } +static PyObject *_wrap_wxRegionIterator___nonzero__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxRegionIterator * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator___nonzero__",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator___nonzero__. Expected _wxRegionIterator_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxRegionIterator___nonzero__(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static PyMethodDef gdicMethods[] = { + { "wxRegionIterator___nonzero__", (PyCFunction) _wrap_wxRegionIterator___nonzero__, METH_VARARGS | METH_KEYWORDS }, { "wxRegionIterator_Next", (PyCFunction) _wrap_wxRegionIterator_Next, METH_VARARGS | METH_KEYWORDS }, { "wxRegionIterator_Reset", (PyCFunction) _wrap_wxRegionIterator_Reset, METH_VARARGS | METH_KEYWORDS }, { "wxRegionIterator_HaveRects", (PyCFunction) _wrap_wxRegionIterator_HaveRects, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py index 034c0529cd..9dca1a4c94 100644 --- a/wxPython/src/msw/gdi.py +++ b/wxPython/src/msw/gdi.py @@ -364,7 +364,7 @@ class wxColourPtr(wxObjectPtr): return "<%s.%s instance; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) asTuple = Get def __str__(self): return str(self.asTuple()) - def __repr__(self): return 'wxColour:' + str(self.asTuple()) + def __repr__(self): return 'wxColour' + str(self.asTuple()) def __nonzero__(self): return self.Ok() def __getinitargs__(self): return () def __getstate__(self): return self.asTuple() @@ -1424,6 +1424,9 @@ class wxRegionIteratorPtr(wxObjectPtr): def Next(self, *_args, **_kwargs): val = gdic.wxRegionIterator_Next(self, *_args, **_kwargs) return val + def __nonzero__(self, *_args, **_kwargs): + val = gdic.wxRegionIterator___nonzero__(self, *_args, **_kwargs) + return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxRegionIterator(wxRegionIteratorPtr): diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp index db073613dc..a5e4a9d997 100644 --- a/wxPython/src/msw/windows.cpp +++ b/wxPython/src/msw/windows.cpp @@ -11906,6 +11906,78 @@ static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxMenuItem_SetDisabledBitmap(_swigobj,_swigarg0) (_swigobj->SetDisabledBitmap(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetDisabledBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxBitmap * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bmpDisabled", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetDisabledBitmap",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetDisabledBitmap. Expected _wxMenuItem_p."); + return NULL; + } + } + if (_argo1) { + if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetDisabledBitmap. Expected _wxBitmap_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxMenuItem_SetDisabledBitmap(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_GetDisabledBitmap(_swigobj) (_swigobj->GetDisabledBitmap()) +static PyObject *_wrap_wxMenuItem_GetDisabledBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _result; + wxMenuItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetDisabledBitmap",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetDisabledBitmap. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxBitmap & _result_ref = wxMenuItem_GetDisabledBitmap(_arg0); + _result = (wxBitmap *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + #define wxMenuItem_SetMarginWidth(_swigobj,_swigarg0) (_swigobj->SetMarginWidth(_swigarg0)) static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -12009,6 +12081,37 @@ static PyObject *_wrap_wxMenuItem_IsOwnerDrawn(PyObject *self, PyObject *args, P return _resultobj; } +#define wxMenuItem_SetOwnerDrawn(_swigobj,_swigarg0) (_swigobj->SetOwnerDrawn(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetOwnerDrawn(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + bool _arg1 = (bool ) TRUE; + PyObject * _argo0 = 0; + int tempbool1 = (int) TRUE; + char *_kwnames[] = { "self","ownerDrawn", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_SetOwnerDrawn",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetOwnerDrawn. Expected _wxMenuItem_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxMenuItem_SetOwnerDrawn(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxMenuItem_ResetOwnerDrawn(_swigobj) (_swigobj->ResetOwnerDrawn()) static PyObject *_wrap_wxMenuItem_ResetOwnerDrawn(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -12113,10 +12216,13 @@ static PyMethodDef windowscMethods[] = { { "wxMenuItem_GetBitmap", (PyCFunction) _wrap_wxMenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_SetBitmap", (PyCFunction) _wrap_wxMenuItem_SetBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_ResetOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_ResetOwnerDrawn, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_SetOwnerDrawn, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_IsOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_IsOwnerDrawn, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetDefaultMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetDefaultMarginWidth, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetMarginWidth, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_SetMarginWidth", (PyCFunction) _wrap_wxMenuItem_SetMarginWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_GetDisabledBitmap", (PyCFunction) _wrap_wxMenuItem_GetDisabledBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetDisabledBitmap", (PyCFunction) _wrap_wxMenuItem_SetDisabledBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_SetBitmaps", (PyCFunction) _wrap_wxMenuItem_SetBitmaps, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_SetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index 36ec4b822b..2ce9fd364d 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -1163,6 +1163,13 @@ class wxMenuItemPtr(wxObjectPtr): def SetBitmaps(self, *_args, **_kwargs): val = windowsc.wxMenuItem_SetBitmaps(self, *_args, **_kwargs) return val + def SetDisabledBitmap(self, *_args, **_kwargs): + val = windowsc.wxMenuItem_SetDisabledBitmap(self, *_args, **_kwargs) + return val + def GetDisabledBitmap(self, *_args, **_kwargs): + val = windowsc.wxMenuItem_GetDisabledBitmap(self, *_args, **_kwargs) + if val: val = wxBitmapPtr(val) + return val def SetMarginWidth(self, *_args, **_kwargs): val = windowsc.wxMenuItem_SetMarginWidth(self, *_args, **_kwargs) return val @@ -1172,6 +1179,9 @@ class wxMenuItemPtr(wxObjectPtr): def IsOwnerDrawn(self, *_args, **_kwargs): val = windowsc.wxMenuItem_IsOwnerDrawn(self, *_args, **_kwargs) return val + def SetOwnerDrawn(self, *_args, **_kwargs): + val = windowsc.wxMenuItem_SetOwnerDrawn(self, *_args, **_kwargs) + return val def ResetOwnerDrawn(self, *_args, **_kwargs): val = windowsc.wxMenuItem_ResetOwnerDrawn(self, *_args, **_kwargs) return val diff --git a/wxPython/src/msw/windows2.cpp b/wxPython/src/msw/windows2.cpp index 4d095a19a0..a3d233c3fe 100644 --- a/wxPython/src/msw/windows2.cpp +++ b/wxPython/src/msw/windows2.cpp @@ -832,7 +832,7 @@ static PyObject *_wrap_wxBookCtrl_AddPage(PyObject *self, PyObject *args, PyObje PyObject * _argo1 = 0; PyObject * _obj2 = 0; int tempbool3 = (int) false; - char *_kwnames[] = { "self","page","text","bSelect","imageId", NULL }; + char *_kwnames[] = { "self","page","text","select","imageId", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxBookCtrl_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&tempbool3,&_arg4)) @@ -885,7 +885,7 @@ static PyObject *_wrap_wxBookCtrl_InsertPage(PyObject *self, PyObject *args, PyO PyObject * _argo2 = 0; PyObject * _obj3 = 0; int tempbool4 = (int) false; - char *_kwnames[] = { "self","n","page","text","bSelect","imageId", NULL }; + char *_kwnames[] = { "self","n","page","text","select","imageId", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|ii:wxBookCtrl_InsertPage",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index c3fcb4eac2..c40d2063ab 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -1789,24 +1789,6 @@ static PyObject *_wrap_wxPyApp_SetAssertMode(PyObject *self, PyObject *args, PyO return _resultobj; } -static PyObject *_wrap_wxPyApp_GetMacDefaultEncodingIsPC(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - char *_kwnames[] = { NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxPyApp_GetMacDefaultEncodingIsPC",_kwnames)) - return NULL; -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPyApp::GetMacDefaultEncodingIsPC(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static PyObject *_wrap_wxPyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; @@ -1906,27 +1888,6 @@ static PyObject *_wrap_wxPyApp_GetMacHelpMenuTitleName(PyObject *self, PyObject return _resultobj; } -static PyObject *_wrap_wxPyApp_SetMacDefaultEncodingIsPC(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _arg0; - int tempbool0; - char *_kwnames[] = { "val", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxPyApp_SetMacDefaultEncodingIsPC",_kwnames,&tempbool0)) - return NULL; - _arg0 = (bool ) tempbool0; -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPyApp::SetMacDefaultEncodingIsPC(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - static PyObject *_wrap_wxPyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _arg0; @@ -2040,13 +2001,11 @@ static PyMethodDef wxcMethods[] = { { "wxPyApp_SetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_SetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS }, - { "wxPyApp_SetMacDefaultEncodingIsPC", (PyCFunction) _wrap_wxPyApp_SetMacDefaultEncodingIsPC, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetMacHelpMenuTitleName", (PyCFunction) _wrap_wxPyApp_GetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetMacExitMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS }, - { "wxPyApp_GetMacDefaultEncodingIsPC", (PyCFunction) _wrap_wxPyApp_GetMacDefaultEncodingIsPC, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetAssertMode", (PyCFunction) _wrap_wxPyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_GetAssertMode", (PyCFunction) _wrap_wxPyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetUseBestVisual", (PyCFunction) _wrap_wxPyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS }, @@ -2387,6 +2346,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxID_HELP_PROCEDURES", PyInt_FromLong((long) wxID_HELP_PROCEDURES)); PyDict_SetItemString(d,"wxID_HELP_CONTEXT", PyInt_FromLong((long) wxID_HELP_CONTEXT)); PyDict_SetItemString(d,"wxID_CLOSE_ALL", PyInt_FromLong((long) wxID_CLOSE_ALL)); + PyDict_SetItemString(d,"wxID_PREFERENCES", PyInt_FromLong((long) wxID_PREFERENCES)); PyDict_SetItemString(d,"wxID_CUT", PyInt_FromLong((long) wxID_CUT)); PyDict_SetItemString(d,"wxID_COPY", PyInt_FromLong((long) wxID_COPY)); PyDict_SetItemString(d,"wxID_PASTE", PyInt_FromLong((long) wxID_PASTE)); @@ -2455,6 +2415,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxMENU_TEAROFF", PyInt_FromLong((long) wxMENU_TEAROFF)); PyDict_SetItemString(d,"wxMB_DOCKABLE", PyInt_FromLong((long) wxMB_DOCKABLE)); PyDict_SetItemString(d,"wxNO_FULL_REPAINT_ON_RESIZE", PyInt_FromLong((long) wxNO_FULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"wxFULL_REPAINT_ON_RESIZE", PyInt_FromLong((long) wxFULL_REPAINT_ON_RESIZE)); PyDict_SetItemString(d,"wxLEFT", PyInt_FromLong((long) wxLEFT)); PyDict_SetItemString(d,"wxRIGHT", PyInt_FromLong((long) wxRIGHT)); PyDict_SetItemString(d,"wxUP", PyInt_FromLong((long) wxUP)); diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index 5dff12250f..bc4da5bc13 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -164,8 +164,6 @@ def wxGetApp(*_args, **_kwargs): wxApp_CleanUp = wxc.wxApp_CleanUp -wxPyApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC - wxPyApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts wxPyApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId @@ -176,8 +174,6 @@ wxPyApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId wxPyApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName -wxPyApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC - wxPyApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts wxPyApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId @@ -373,6 +369,7 @@ wxID_HELP_COMMANDS = wxc.wxID_HELP_COMMANDS wxID_HELP_PROCEDURES = wxc.wxID_HELP_PROCEDURES wxID_HELP_CONTEXT = wxc.wxID_HELP_CONTEXT wxID_CLOSE_ALL = wxc.wxID_CLOSE_ALL +wxID_PREFERENCES = wxc.wxID_PREFERENCES wxID_CUT = wxc.wxID_CUT wxID_COPY = wxc.wxID_COPY wxID_PASTE = wxc.wxID_PASTE @@ -441,6 +438,7 @@ wxDD_DEFAULT_STYLE = wxc.wxDD_DEFAULT_STYLE wxMENU_TEAROFF = wxc.wxMENU_TEAROFF wxMB_DOCKABLE = wxc.wxMB_DOCKABLE wxNO_FULL_REPAINT_ON_RESIZE = wxc.wxNO_FULL_REPAINT_ON_RESIZE +wxFULL_REPAINT_ON_RESIZE = wxc.wxFULL_REPAINT_ON_RESIZE wxLEFT = wxc.wxLEFT wxRIGHT = wxc.wxRIGHT wxUP = wxc.wxUP @@ -1904,8 +1902,11 @@ of your Mac.""" # KeyboardInterrupt???) but will later segfault on exit. By # setting the default handler then the app will exit, as # expected (depending on platform.) - import signal - signal.signal(signal.SIGINT, signal.SIG_DFL) + try: + import signal + signal.signal(signal.SIGINT, signal.SIG_DFL) + except: + pass # this initializes wxWindows and then calls our OnInit _wxStart(self.OnInit) @@ -1942,13 +1943,11 @@ of your Mac.""" # change from wxPyApp_ to wxApp_ -wxApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName -wxApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId