From c2829a8f673617ff5217a5982a2f0df5c5b72e10 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 2 Oct 2006 20:14:50 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_core.py | 9 -- wxPython/src/gtk/_core_wrap.cpp | 35 ------- wxPython/src/gtk/_misc.py | 6 +- wxPython/src/gtk/_misc_wrap.cpp | 16 ++-- wxPython/src/gtk/richtext.py | 22 ++++- wxPython/src/gtk/richtext_wrap.cpp | 142 +++++++++++++++++++++++++++++ wxPython/src/mac/_core.py | 9 -- wxPython/src/mac/_core_wrap.cpp | 35 ------- wxPython/src/mac/_gdi.py | 2 +- wxPython/src/mac/_misc.py | 6 +- wxPython/src/mac/_misc_wrap.cpp | 16 ++-- wxPython/src/mac/richtext.py | 22 ++++- wxPython/src/mac/richtext_wrap.cpp | 142 +++++++++++++++++++++++++++++ wxPython/src/msw/_core.py | 9 -- wxPython/src/msw/_core_wrap.cpp | 35 ------- wxPython/src/msw/_gdi.py | 2 +- wxPython/src/msw/_misc.py | 6 +- wxPython/src/msw/_misc_wrap.cpp | 16 ++-- wxPython/src/msw/richtext.py | 22 ++++- wxPython/src/msw/richtext_wrap.cpp | 142 +++++++++++++++++++++++++++++ 20 files changed, 524 insertions(+), 170 deletions(-) diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 8f06644198..a941f30e6b 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -11008,14 +11008,6 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) - def GetLabel(*args, **kwargs): - """ - GetLabel(self) -> String - - Return a control's text. - """ - return _core_.Control_GetLabel(*args, **kwargs) - def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11035,7 +11027,6 @@ class Control(Window): GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) Alignment = property(GetAlignment,doc="See `GetAlignment`") - Label = property(GetLabel,doc="See `GetLabel`") LabelText = property(GetLabelText,doc="See `GetLabelText`") _core_.Control_swigregister(Control) ControlNameStr = cvar.ControlNameStr diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index 95f7a28f7c..4af8ab1b1c 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -45314,40 +45314,6 @@ fail: } -SWIGINTERN PyObject *_wrap_Control_GetLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxControl *arg1 = (wxControl *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxControl, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Control_GetLabel" "', expected argument " "1"" of type '" "wxControl *""'"); - } - arg1 = reinterpret_cast< wxControl * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetLabel(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -55423,7 +55389,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Control_GetAlignment", (PyCFunction)_wrap_Control_GetAlignment, METH_O, NULL}, { (char *)"Control_GetLabelText", (PyCFunction)_wrap_Control_GetLabelText, METH_O, NULL}, { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Control_GetLabel", (PyCFunction)_wrap_Control_GetLabel, METH_O, NULL}, { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS, NULL}, { (char *)"Control_swiginit", Control_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index d8a997ccfc..75db32bf1e 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -5804,7 +5804,7 @@ class Display(object): __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, size_t index=0) -> Display + __init__(self, unsigned int index=0) -> Display Set up a Display instance with the specified display. The displays are numbered from 0 to GetCount() - 1, 0 is always the primary display @@ -5815,7 +5815,7 @@ class Display(object): __del__ = lambda self : None; def GetCount(*args, **kwargs): """ - GetCount() -> size_t + GetCount() -> unsigned int Return the number of available displays. """ @@ -5949,7 +5949,7 @@ DefaultVideoMode = cvar.DefaultVideoMode def Display_GetCount(*args): """ - Display_GetCount() -> size_t + Display_GetCount() -> unsigned int Return the number of available displays. """ diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 0b3b8211ee..c251ed500a 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -36291,9 +36291,9 @@ SWIGINTERN PyObject *DefaultVideoMode_get(void) { SWIGINTERN PyObject *_wrap_new_Display(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; - size_t arg1 = (size_t) 0 ; + unsigned int arg1 = (unsigned int) 0 ; wxDisplay *result = 0 ; - size_t val1 ; + unsigned int val1 ; int ecode1 = 0 ; PyObject * obj0 = 0 ; char * kwnames[] = { @@ -36302,11 +36302,11 @@ SWIGINTERN PyObject *_wrap_new_Display(PyObject *SWIGUNUSEDPARM(self), PyObject if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Display",kwnames,&obj0)) SWIG_fail; if (obj0) { - ecode1 = SWIG_AsVal_size_t(obj0, &val1); + ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1); if (!SWIG_IsOK(ecode1)) { - SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Display" "', expected argument " "1"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Display" "', expected argument " "1"" of type '" "unsigned int""'"); } - arg1 = static_cast< size_t >(val1); + arg1 = static_cast< unsigned int >(val1); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -36351,16 +36351,16 @@ fail: SWIGINTERN PyObject *_wrap_Display_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - size_t result; + unsigned int result; if (!SWIG_Python_UnpackTuple(args,"Display_GetCount",0,0,0)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (size_t)wxDisplay::GetCount(); + result = (unsigned int)wxDisplay::GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); + resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; fail: return NULL; diff --git a/wxPython/src/gtk/richtext.py b/wxPython/src/gtk/richtext.py index 5670dacc9d..7bf959ae1f 100644 --- a/wxPython/src/gtk/richtext.py +++ b/wxPython/src/gtk/richtext.py @@ -81,6 +81,8 @@ RICHTEXT_HITTEST_AFTER = _richtext.RICHTEXT_HITTEST_AFTER RICHTEXT_HITTEST_ON = _richtext.RICHTEXT_HITTEST_ON RICHTEXT_FORMATTED = _richtext.RICHTEXT_FORMATTED RICHTEXT_UNFORMATTED = _richtext.RICHTEXT_UNFORMATTED +RICHTEXT_INSERT_NONE = _richtext.RICHTEXT_INSERT_NONE +RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE = _richtext.RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE TEXT_ATTR_TEXT_COLOUR = _richtext.TEXT_ATTR_TEXT_COLOUR TEXT_ATTR_BACKGROUND_COLOUR = _richtext.TEXT_ATTR_BACKGROUND_COLOUR TEXT_ATTR_FONT_FACE = _richtext.TEXT_ATTR_FONT_FACE @@ -761,11 +763,21 @@ class RichTextCtrl(_windows.ScrolledWindow): GetStyle(self, long position, RichTextAttr style) -> bool Retrieve the style used at the given position. Copies the style - values at ``position`` into the ``style`` parameter returns ``True`` + values at ``position`` into the ``style`` parameter and returns ``True`` if successful. Returns ``False`` otherwise. """ return _richtext.RichTextCtrl_GetStyle(*args, **kwargs) + def GetUncombinedStyle(*args, **kwargs): + """ + GetUncombinedStyle(self, long position, RichTextAttr style) -> bool + + Get the content (uncombined) attributes for this position. Copies the + style values at ``position`` into the ``style`` parameter and returns + ``True`` if successful. Returns ``False`` otherwise. + """ + return _richtext.RichTextCtrl_GetUncombinedStyle(*args, **kwargs) + def SetDefaultStyle(*args, **kwargs): """ SetDefaultStyle(self, RichTextAttr style) -> bool @@ -1153,6 +1165,10 @@ class RichTextCtrl(_windows.ScrolledWindow): """SelectNone(self)""" return _richtext.RichTextCtrl_SelectNone(*args, **kwargs) + def SelectWord(*args, **kwargs): + """SelectWord(self, long position) -> bool""" + return _richtext.RichTextCtrl_SelectWord(*args, **kwargs) + def GetSelectionRange(*args, **kwargs): """GetSelectionRange(self) -> RichTextRange""" return _richtext.RichTextCtrl_GetSelectionRange(*args, **kwargs) @@ -1317,6 +1333,10 @@ class RichTextCtrl(_windows.ScrolledWindow): """GetStyleSheet(self) -> wxRichTextStyleSheet""" return _richtext.RichTextCtrl_GetStyleSheet(*args, **kwargs) + def ApplyStyleSheet(*args, **kwargs): + """ApplyStyleSheet(self, wxRichTextStyleSheet styleSheet=None) -> bool""" + return _richtext.RichTextCtrl_ApplyStyleSheet(*args, **kwargs) + Buffer = property(GetBuffer,doc="See `GetBuffer`") DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") DelayedLayoutThreshold = property(GetDelayedLayoutThreshold,SetDelayedLayoutThreshold,doc="See `GetDelayedLayoutThreshold` and `SetDelayedLayoutThreshold`") diff --git a/wxPython/src/gtk/richtext_wrap.cpp b/wxPython/src/gtk/richtext_wrap.cpp index 8e6519164c..2c8242f587 100644 --- a/wxPython/src/gtk/richtext_wrap.cpp +++ b/wxPython/src/gtk/richtext_wrap.cpp @@ -7290,6 +7290,59 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_GetUncombinedStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + long arg2 ; + wxRichTextAttr *arg3 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + long val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "position",(char *) "style", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RichTextCtrl_GetUncombinedStyle",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_long(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "2"" of type '" "long""'"); + } + arg2 = static_cast< long >(val2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxRichTextAttr, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "3"" of type '" "wxRichTextAttr &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "3"" of type '" "wxRichTextAttr &""'"); + } + arg3 = reinterpret_cast< wxRichTextAttr * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->GetUncombinedStyle(arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RichTextCtrl_SetDefaultStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; @@ -9737,6 +9790,47 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_SelectWord(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + long arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + long val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "position", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RichTextCtrl_SelectWord",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_SelectWord" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_long(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextCtrl_SelectWord" "', expected argument " "2"" of type '" "long""'"); + } + arg2 = static_cast< long >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->SelectWord(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RichTextCtrl_GetSelectionRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; @@ -11400,6 +11494,49 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_ApplyStyleSheet(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + wxRichTextStyleSheet *arg2 = (wxRichTextStyleSheet *) NULL ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "styleSheet", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:RichTextCtrl_ApplyStyleSheet",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_ApplyStyleSheet" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxRichTextStyleSheet, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RichTextCtrl_ApplyStyleSheet" "', expected argument " "2"" of type '" "wxRichTextStyleSheet *""'"); + } + arg2 = reinterpret_cast< wxRichTextStyleSheet * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->ApplyStyleSheet(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *RichTextCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -11719,6 +11856,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_AppendText", (PyCFunction) _wrap_RichTextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetStyle", (PyCFunction) _wrap_RichTextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetStyle", (PyCFunction) _wrap_RichTextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RichTextCtrl_GetUncombinedStyle", (PyCFunction) _wrap_RichTextCtrl_GetUncombinedStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetDefaultStyle", (PyCFunction) _wrap_RichTextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetDefaultStyle", (PyCFunction)_wrap_RichTextCtrl_GetDefaultStyle, METH_O, NULL}, { (char *)"RichTextCtrl_XYToPosition", (PyCFunction) _wrap_RichTextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -11786,6 +11924,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_EndParagraphStyle", (PyCFunction)_wrap_RichTextCtrl_EndParagraphStyle, METH_O, NULL}, { (char *)"RichTextCtrl_SetDefaultStyleToCursorStyle", (PyCFunction)_wrap_RichTextCtrl_SetDefaultStyleToCursorStyle, METH_O, NULL}, { (char *)"RichTextCtrl_SelectNone", (PyCFunction)_wrap_RichTextCtrl_SelectNone, METH_O, NULL}, + { (char *)"RichTextCtrl_SelectWord", (PyCFunction) _wrap_RichTextCtrl_SelectWord, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetSelectionRange, METH_O, NULL}, { (char *)"RichTextCtrl_SetSelectionRange", (PyCFunction) _wrap_RichTextCtrl_SetSelectionRange, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetInternalSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetInternalSelectionRange, METH_O, NULL}, @@ -11827,6 +11966,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_ApplyAlignmentToSelection", (PyCFunction) _wrap_RichTextCtrl_ApplyAlignmentToSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetStyleSheet", (PyCFunction) _wrap_RichTextCtrl_SetStyleSheet, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetStyleSheet", (PyCFunction)_wrap_RichTextCtrl_GetStyleSheet, METH_O, NULL}, + { (char *)"RichTextCtrl_ApplyStyleSheet", (PyCFunction) _wrap_RichTextCtrl_ApplyStyleSheet, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_swigregister", RichTextCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"RichTextCtrl_swiginit", RichTextCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_RichTextEvent", (PyCFunction) _wrap_new_RichTextEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -13962,6 +14102,8 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "RICHTEXT_HITTEST_ON",SWIG_From_int(static_cast< int >(wxRICHTEXT_HITTEST_ON))); SWIG_Python_SetConstant(d, "RICHTEXT_FORMATTED",SWIG_From_int(static_cast< int >(wxRICHTEXT_FORMATTED))); SWIG_Python_SetConstant(d, "RICHTEXT_UNFORMATTED",SWIG_From_int(static_cast< int >(wxRICHTEXT_UNFORMATTED))); + SWIG_Python_SetConstant(d, "RICHTEXT_INSERT_NONE",SWIG_From_int(static_cast< int >(wxRICHTEXT_INSERT_NONE))); + SWIG_Python_SetConstant(d, "RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE",SWIG_From_int(static_cast< int >(wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE))); SWIG_Python_SetConstant(d, "TEXT_ATTR_TEXT_COLOUR",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_TEXT_COLOUR))); SWIG_Python_SetConstant(d, "TEXT_ATTR_BACKGROUND_COLOUR",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_BACKGROUND_COLOUR))); SWIG_Python_SetConstant(d, "TEXT_ATTR_FONT_FACE",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_FONT_FACE))); diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 8f06644198..a941f30e6b 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -11008,14 +11008,6 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) - def GetLabel(*args, **kwargs): - """ - GetLabel(self) -> String - - Return a control's text. - """ - return _core_.Control_GetLabel(*args, **kwargs) - def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11035,7 +11027,6 @@ class Control(Window): GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) Alignment = property(GetAlignment,doc="See `GetAlignment`") - Label = property(GetLabel,doc="See `GetLabel`") LabelText = property(GetLabelText,doc="See `GetLabelText`") _core_.Control_swigregister(Control) ControlNameStr = cvar.ControlNameStr diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 47a8d48d05..e2173cc513 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -45313,40 +45313,6 @@ fail: } -SWIGINTERN PyObject *_wrap_Control_GetLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxControl *arg1 = (wxControl *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxControl, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Control_GetLabel" "', expected argument " "1"" of type '" "wxControl *""'"); - } - arg1 = reinterpret_cast< wxControl * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetLabel(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -55422,7 +55388,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Control_GetAlignment", (PyCFunction)_wrap_Control_GetAlignment, METH_O, NULL}, { (char *)"Control_GetLabelText", (PyCFunction)_wrap_Control_GetLabelText, METH_O, NULL}, { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Control_GetLabel", (PyCFunction)_wrap_Control_GetLabel, METH_O, NULL}, { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS, NULL}, { (char *)"Control_swiginit", Control_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 22daacf9bb..8e6b323ac9 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -2850,7 +2850,7 @@ def EncodingConverter_CanConvert(*args, **kwargs): # to the default catalog path. if wx.Platform == "__WXMSW__": import os - _localedir = os.path.join(os.path.split(__file__)[0], "i18n") + _localedir = os.path.join(os.path.split(__file__)[0], "locale") Locale.AddCatalogLookupPathPrefix(_localedir) del os diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index 70f0067393..2378a5c948 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -5812,7 +5812,7 @@ class Display(object): __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, size_t index=0) -> Display + __init__(self, unsigned int index=0) -> Display Set up a Display instance with the specified display. The displays are numbered from 0 to GetCount() - 1, 0 is always the primary display @@ -5823,7 +5823,7 @@ class Display(object): __del__ = lambda self : None; def GetCount(*args, **kwargs): """ - GetCount() -> size_t + GetCount() -> unsigned int Return the number of available displays. """ @@ -5957,7 +5957,7 @@ DefaultVideoMode = cvar.DefaultVideoMode def Display_GetCount(*args): """ - Display_GetCount() -> size_t + Display_GetCount() -> unsigned int Return the number of available displays. """ diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index 9c738e4c14..522467aeb6 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -36352,9 +36352,9 @@ SWIGINTERN PyObject *DefaultVideoMode_get(void) { SWIGINTERN PyObject *_wrap_new_Display(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; - size_t arg1 = (size_t) 0 ; + unsigned int arg1 = (unsigned int) 0 ; wxDisplay *result = 0 ; - size_t val1 ; + unsigned int val1 ; int ecode1 = 0 ; PyObject * obj0 = 0 ; char * kwnames[] = { @@ -36363,11 +36363,11 @@ SWIGINTERN PyObject *_wrap_new_Display(PyObject *SWIGUNUSEDPARM(self), PyObject if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Display",kwnames,&obj0)) SWIG_fail; if (obj0) { - ecode1 = SWIG_AsVal_size_t(obj0, &val1); + ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1); if (!SWIG_IsOK(ecode1)) { - SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Display" "', expected argument " "1"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Display" "', expected argument " "1"" of type '" "unsigned int""'"); } - arg1 = static_cast< size_t >(val1); + arg1 = static_cast< unsigned int >(val1); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -36412,16 +36412,16 @@ fail: SWIGINTERN PyObject *_wrap_Display_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - size_t result; + unsigned int result; if (!SWIG_Python_UnpackTuple(args,"Display_GetCount",0,0,0)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (size_t)wxDisplay::GetCount(); + result = (unsigned int)wxDisplay::GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); + resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/richtext.py b/wxPython/src/mac/richtext.py index 5670dacc9d..7bf959ae1f 100644 --- a/wxPython/src/mac/richtext.py +++ b/wxPython/src/mac/richtext.py @@ -81,6 +81,8 @@ RICHTEXT_HITTEST_AFTER = _richtext.RICHTEXT_HITTEST_AFTER RICHTEXT_HITTEST_ON = _richtext.RICHTEXT_HITTEST_ON RICHTEXT_FORMATTED = _richtext.RICHTEXT_FORMATTED RICHTEXT_UNFORMATTED = _richtext.RICHTEXT_UNFORMATTED +RICHTEXT_INSERT_NONE = _richtext.RICHTEXT_INSERT_NONE +RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE = _richtext.RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE TEXT_ATTR_TEXT_COLOUR = _richtext.TEXT_ATTR_TEXT_COLOUR TEXT_ATTR_BACKGROUND_COLOUR = _richtext.TEXT_ATTR_BACKGROUND_COLOUR TEXT_ATTR_FONT_FACE = _richtext.TEXT_ATTR_FONT_FACE @@ -761,11 +763,21 @@ class RichTextCtrl(_windows.ScrolledWindow): GetStyle(self, long position, RichTextAttr style) -> bool Retrieve the style used at the given position. Copies the style - values at ``position`` into the ``style`` parameter returns ``True`` + values at ``position`` into the ``style`` parameter and returns ``True`` if successful. Returns ``False`` otherwise. """ return _richtext.RichTextCtrl_GetStyle(*args, **kwargs) + def GetUncombinedStyle(*args, **kwargs): + """ + GetUncombinedStyle(self, long position, RichTextAttr style) -> bool + + Get the content (uncombined) attributes for this position. Copies the + style values at ``position`` into the ``style`` parameter and returns + ``True`` if successful. Returns ``False`` otherwise. + """ + return _richtext.RichTextCtrl_GetUncombinedStyle(*args, **kwargs) + def SetDefaultStyle(*args, **kwargs): """ SetDefaultStyle(self, RichTextAttr style) -> bool @@ -1153,6 +1165,10 @@ class RichTextCtrl(_windows.ScrolledWindow): """SelectNone(self)""" return _richtext.RichTextCtrl_SelectNone(*args, **kwargs) + def SelectWord(*args, **kwargs): + """SelectWord(self, long position) -> bool""" + return _richtext.RichTextCtrl_SelectWord(*args, **kwargs) + def GetSelectionRange(*args, **kwargs): """GetSelectionRange(self) -> RichTextRange""" return _richtext.RichTextCtrl_GetSelectionRange(*args, **kwargs) @@ -1317,6 +1333,10 @@ class RichTextCtrl(_windows.ScrolledWindow): """GetStyleSheet(self) -> wxRichTextStyleSheet""" return _richtext.RichTextCtrl_GetStyleSheet(*args, **kwargs) + def ApplyStyleSheet(*args, **kwargs): + """ApplyStyleSheet(self, wxRichTextStyleSheet styleSheet=None) -> bool""" + return _richtext.RichTextCtrl_ApplyStyleSheet(*args, **kwargs) + Buffer = property(GetBuffer,doc="See `GetBuffer`") DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") DelayedLayoutThreshold = property(GetDelayedLayoutThreshold,SetDelayedLayoutThreshold,doc="See `GetDelayedLayoutThreshold` and `SetDelayedLayoutThreshold`") diff --git a/wxPython/src/mac/richtext_wrap.cpp b/wxPython/src/mac/richtext_wrap.cpp index bd44628544..5918845e26 100644 --- a/wxPython/src/mac/richtext_wrap.cpp +++ b/wxPython/src/mac/richtext_wrap.cpp @@ -7290,6 +7290,59 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_GetUncombinedStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + long arg2 ; + wxRichTextAttr *arg3 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + long val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "position",(char *) "style", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RichTextCtrl_GetUncombinedStyle",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_long(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "2"" of type '" "long""'"); + } + arg2 = static_cast< long >(val2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxRichTextAttr, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "3"" of type '" "wxRichTextAttr &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "3"" of type '" "wxRichTextAttr &""'"); + } + arg3 = reinterpret_cast< wxRichTextAttr * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->GetUncombinedStyle(arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RichTextCtrl_SetDefaultStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; @@ -9737,6 +9790,47 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_SelectWord(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + long arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + long val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "position", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RichTextCtrl_SelectWord",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_SelectWord" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_long(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextCtrl_SelectWord" "', expected argument " "2"" of type '" "long""'"); + } + arg2 = static_cast< long >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->SelectWord(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RichTextCtrl_GetSelectionRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; @@ -11400,6 +11494,49 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_ApplyStyleSheet(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + wxRichTextStyleSheet *arg2 = (wxRichTextStyleSheet *) NULL ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "styleSheet", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:RichTextCtrl_ApplyStyleSheet",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_ApplyStyleSheet" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxRichTextStyleSheet, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RichTextCtrl_ApplyStyleSheet" "', expected argument " "2"" of type '" "wxRichTextStyleSheet *""'"); + } + arg2 = reinterpret_cast< wxRichTextStyleSheet * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->ApplyStyleSheet(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *RichTextCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -11719,6 +11856,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_AppendText", (PyCFunction) _wrap_RichTextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetStyle", (PyCFunction) _wrap_RichTextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetStyle", (PyCFunction) _wrap_RichTextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RichTextCtrl_GetUncombinedStyle", (PyCFunction) _wrap_RichTextCtrl_GetUncombinedStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetDefaultStyle", (PyCFunction) _wrap_RichTextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetDefaultStyle", (PyCFunction)_wrap_RichTextCtrl_GetDefaultStyle, METH_O, NULL}, { (char *)"RichTextCtrl_XYToPosition", (PyCFunction) _wrap_RichTextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -11786,6 +11924,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_EndParagraphStyle", (PyCFunction)_wrap_RichTextCtrl_EndParagraphStyle, METH_O, NULL}, { (char *)"RichTextCtrl_SetDefaultStyleToCursorStyle", (PyCFunction)_wrap_RichTextCtrl_SetDefaultStyleToCursorStyle, METH_O, NULL}, { (char *)"RichTextCtrl_SelectNone", (PyCFunction)_wrap_RichTextCtrl_SelectNone, METH_O, NULL}, + { (char *)"RichTextCtrl_SelectWord", (PyCFunction) _wrap_RichTextCtrl_SelectWord, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetSelectionRange, METH_O, NULL}, { (char *)"RichTextCtrl_SetSelectionRange", (PyCFunction) _wrap_RichTextCtrl_SetSelectionRange, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetInternalSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetInternalSelectionRange, METH_O, NULL}, @@ -11827,6 +11966,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_ApplyAlignmentToSelection", (PyCFunction) _wrap_RichTextCtrl_ApplyAlignmentToSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetStyleSheet", (PyCFunction) _wrap_RichTextCtrl_SetStyleSheet, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetStyleSheet", (PyCFunction)_wrap_RichTextCtrl_GetStyleSheet, METH_O, NULL}, + { (char *)"RichTextCtrl_ApplyStyleSheet", (PyCFunction) _wrap_RichTextCtrl_ApplyStyleSheet, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_swigregister", RichTextCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"RichTextCtrl_swiginit", RichTextCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_RichTextEvent", (PyCFunction) _wrap_new_RichTextEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -13962,6 +14102,8 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "RICHTEXT_HITTEST_ON",SWIG_From_int(static_cast< int >(wxRICHTEXT_HITTEST_ON))); SWIG_Python_SetConstant(d, "RICHTEXT_FORMATTED",SWIG_From_int(static_cast< int >(wxRICHTEXT_FORMATTED))); SWIG_Python_SetConstant(d, "RICHTEXT_UNFORMATTED",SWIG_From_int(static_cast< int >(wxRICHTEXT_UNFORMATTED))); + SWIG_Python_SetConstant(d, "RICHTEXT_INSERT_NONE",SWIG_From_int(static_cast< int >(wxRICHTEXT_INSERT_NONE))); + SWIG_Python_SetConstant(d, "RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE",SWIG_From_int(static_cast< int >(wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE))); SWIG_Python_SetConstant(d, "TEXT_ATTR_TEXT_COLOUR",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_TEXT_COLOUR))); SWIG_Python_SetConstant(d, "TEXT_ATTR_BACKGROUND_COLOUR",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_BACKGROUND_COLOUR))); SWIG_Python_SetConstant(d, "TEXT_ATTR_FONT_FACE",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_FONT_FACE))); diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 40f94cdb62..06781059eb 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -11012,14 +11012,6 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) - def GetLabel(*args, **kwargs): - """ - GetLabel(self) -> String - - Return a control's text. - """ - return _core_.Control_GetLabel(*args, **kwargs) - def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11039,7 +11031,6 @@ class Control(Window): GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) Alignment = property(GetAlignment,doc="See `GetAlignment`") - Label = property(GetLabel,doc="See `GetLabel`") LabelText = property(GetLabelText,doc="See `GetLabelText`") _core_.Control_swigregister(Control) ControlNameStr = cvar.ControlNameStr diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index c897f90d12..d74e9d4df0 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -45339,40 +45339,6 @@ fail: } -SWIGINTERN PyObject *_wrap_Control_GetLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxControl *arg1 = (wxControl *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxControl, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Control_GetLabel" "', expected argument " "1"" of type '" "wxControl *""'"); - } - arg1 = reinterpret_cast< wxControl * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetLabel(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -55449,7 +55415,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Control_GetAlignment", (PyCFunction)_wrap_Control_GetAlignment, METH_O, NULL}, { (char *)"Control_GetLabelText", (PyCFunction)_wrap_Control_GetLabelText, METH_O, NULL}, { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Control_GetLabel", (PyCFunction)_wrap_Control_GetLabel, METH_O, NULL}, { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS, NULL}, { (char *)"Control_swiginit", Control_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 87a691b65a..1ca38b70b7 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -2940,7 +2940,7 @@ def EncodingConverter_CanConvert(*args, **kwargs): # to the default catalog path. if wx.Platform == "__WXMSW__": import os - _localedir = os.path.join(os.path.split(__file__)[0], "i18n") + _localedir = os.path.join(os.path.split(__file__)[0], "locale") Locale.AddCatalogLookupPathPrefix(_localedir) del os diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index 70f0067393..2378a5c948 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -5812,7 +5812,7 @@ class Display(object): __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, size_t index=0) -> Display + __init__(self, unsigned int index=0) -> Display Set up a Display instance with the specified display. The displays are numbered from 0 to GetCount() - 1, 0 is always the primary display @@ -5823,7 +5823,7 @@ class Display(object): __del__ = lambda self : None; def GetCount(*args, **kwargs): """ - GetCount() -> size_t + GetCount() -> unsigned int Return the number of available displays. """ @@ -5957,7 +5957,7 @@ DefaultVideoMode = cvar.DefaultVideoMode def Display_GetCount(*args): """ - Display_GetCount() -> size_t + Display_GetCount() -> unsigned int Return the number of available displays. """ diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index 7240c47001..cc05b95a5f 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -36352,9 +36352,9 @@ SWIGINTERN PyObject *DefaultVideoMode_get(void) { SWIGINTERN PyObject *_wrap_new_Display(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; - size_t arg1 = (size_t) 0 ; + unsigned int arg1 = (unsigned int) 0 ; wxDisplay *result = 0 ; - size_t val1 ; + unsigned int val1 ; int ecode1 = 0 ; PyObject * obj0 = 0 ; char * kwnames[] = { @@ -36363,11 +36363,11 @@ SWIGINTERN PyObject *_wrap_new_Display(PyObject *SWIGUNUSEDPARM(self), PyObject if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Display",kwnames,&obj0)) SWIG_fail; if (obj0) { - ecode1 = SWIG_AsVal_size_t(obj0, &val1); + ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1); if (!SWIG_IsOK(ecode1)) { - SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Display" "', expected argument " "1"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Display" "', expected argument " "1"" of type '" "unsigned int""'"); } - arg1 = static_cast< size_t >(val1); + arg1 = static_cast< unsigned int >(val1); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -36412,16 +36412,16 @@ fail: SWIGINTERN PyObject *_wrap_Display_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - size_t result; + unsigned int result; if (!SWIG_Python_UnpackTuple(args,"Display_GetCount",0,0,0)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (size_t)wxDisplay::GetCount(); + result = (unsigned int)wxDisplay::GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); + resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; fail: return NULL; diff --git a/wxPython/src/msw/richtext.py b/wxPython/src/msw/richtext.py index 5670dacc9d..7bf959ae1f 100644 --- a/wxPython/src/msw/richtext.py +++ b/wxPython/src/msw/richtext.py @@ -81,6 +81,8 @@ RICHTEXT_HITTEST_AFTER = _richtext.RICHTEXT_HITTEST_AFTER RICHTEXT_HITTEST_ON = _richtext.RICHTEXT_HITTEST_ON RICHTEXT_FORMATTED = _richtext.RICHTEXT_FORMATTED RICHTEXT_UNFORMATTED = _richtext.RICHTEXT_UNFORMATTED +RICHTEXT_INSERT_NONE = _richtext.RICHTEXT_INSERT_NONE +RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE = _richtext.RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE TEXT_ATTR_TEXT_COLOUR = _richtext.TEXT_ATTR_TEXT_COLOUR TEXT_ATTR_BACKGROUND_COLOUR = _richtext.TEXT_ATTR_BACKGROUND_COLOUR TEXT_ATTR_FONT_FACE = _richtext.TEXT_ATTR_FONT_FACE @@ -761,11 +763,21 @@ class RichTextCtrl(_windows.ScrolledWindow): GetStyle(self, long position, RichTextAttr style) -> bool Retrieve the style used at the given position. Copies the style - values at ``position`` into the ``style`` parameter returns ``True`` + values at ``position`` into the ``style`` parameter and returns ``True`` if successful. Returns ``False`` otherwise. """ return _richtext.RichTextCtrl_GetStyle(*args, **kwargs) + def GetUncombinedStyle(*args, **kwargs): + """ + GetUncombinedStyle(self, long position, RichTextAttr style) -> bool + + Get the content (uncombined) attributes for this position. Copies the + style values at ``position`` into the ``style`` parameter and returns + ``True`` if successful. Returns ``False`` otherwise. + """ + return _richtext.RichTextCtrl_GetUncombinedStyle(*args, **kwargs) + def SetDefaultStyle(*args, **kwargs): """ SetDefaultStyle(self, RichTextAttr style) -> bool @@ -1153,6 +1165,10 @@ class RichTextCtrl(_windows.ScrolledWindow): """SelectNone(self)""" return _richtext.RichTextCtrl_SelectNone(*args, **kwargs) + def SelectWord(*args, **kwargs): + """SelectWord(self, long position) -> bool""" + return _richtext.RichTextCtrl_SelectWord(*args, **kwargs) + def GetSelectionRange(*args, **kwargs): """GetSelectionRange(self) -> RichTextRange""" return _richtext.RichTextCtrl_GetSelectionRange(*args, **kwargs) @@ -1317,6 +1333,10 @@ class RichTextCtrl(_windows.ScrolledWindow): """GetStyleSheet(self) -> wxRichTextStyleSheet""" return _richtext.RichTextCtrl_GetStyleSheet(*args, **kwargs) + def ApplyStyleSheet(*args, **kwargs): + """ApplyStyleSheet(self, wxRichTextStyleSheet styleSheet=None) -> bool""" + return _richtext.RichTextCtrl_ApplyStyleSheet(*args, **kwargs) + Buffer = property(GetBuffer,doc="See `GetBuffer`") DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") DelayedLayoutThreshold = property(GetDelayedLayoutThreshold,SetDelayedLayoutThreshold,doc="See `GetDelayedLayoutThreshold` and `SetDelayedLayoutThreshold`") diff --git a/wxPython/src/msw/richtext_wrap.cpp b/wxPython/src/msw/richtext_wrap.cpp index 8e6519164c..2c8242f587 100644 --- a/wxPython/src/msw/richtext_wrap.cpp +++ b/wxPython/src/msw/richtext_wrap.cpp @@ -7290,6 +7290,59 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_GetUncombinedStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + long arg2 ; + wxRichTextAttr *arg3 = 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + long val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "position",(char *) "style", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RichTextCtrl_GetUncombinedStyle",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_long(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "2"" of type '" "long""'"); + } + arg2 = static_cast< long >(val2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxRichTextAttr, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "3"" of type '" "wxRichTextAttr &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RichTextCtrl_GetUncombinedStyle" "', expected argument " "3"" of type '" "wxRichTextAttr &""'"); + } + arg3 = reinterpret_cast< wxRichTextAttr * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->GetUncombinedStyle(arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RichTextCtrl_SetDefaultStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; @@ -9737,6 +9790,47 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_SelectWord(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + long arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + long val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "position", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RichTextCtrl_SelectWord",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_SelectWord" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + ecode2 = SWIG_AsVal_long(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextCtrl_SelectWord" "', expected argument " "2"" of type '" "long""'"); + } + arg2 = static_cast< long >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->SelectWord(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RichTextCtrl_GetSelectionRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; @@ -11400,6 +11494,49 @@ fail: } +SWIGINTERN PyObject *_wrap_RichTextCtrl_ApplyStyleSheet(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ; + wxRichTextStyleSheet *arg2 = (wxRichTextStyleSheet *) NULL ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "styleSheet", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:RichTextCtrl_ApplyStyleSheet",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_ApplyStyleSheet" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'"); + } + arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxRichTextStyleSheet, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RichTextCtrl_ApplyStyleSheet" "', expected argument " "2"" of type '" "wxRichTextStyleSheet *""'"); + } + arg2 = reinterpret_cast< wxRichTextStyleSheet * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->ApplyStyleSheet(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *RichTextCtrl_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -11719,6 +11856,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_AppendText", (PyCFunction) _wrap_RichTextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetStyle", (PyCFunction) _wrap_RichTextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetStyle", (PyCFunction) _wrap_RichTextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RichTextCtrl_GetUncombinedStyle", (PyCFunction) _wrap_RichTextCtrl_GetUncombinedStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetDefaultStyle", (PyCFunction) _wrap_RichTextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetDefaultStyle", (PyCFunction)_wrap_RichTextCtrl_GetDefaultStyle, METH_O, NULL}, { (char *)"RichTextCtrl_XYToPosition", (PyCFunction) _wrap_RichTextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -11786,6 +11924,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_EndParagraphStyle", (PyCFunction)_wrap_RichTextCtrl_EndParagraphStyle, METH_O, NULL}, { (char *)"RichTextCtrl_SetDefaultStyleToCursorStyle", (PyCFunction)_wrap_RichTextCtrl_SetDefaultStyleToCursorStyle, METH_O, NULL}, { (char *)"RichTextCtrl_SelectNone", (PyCFunction)_wrap_RichTextCtrl_SelectNone, METH_O, NULL}, + { (char *)"RichTextCtrl_SelectWord", (PyCFunction) _wrap_RichTextCtrl_SelectWord, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetSelectionRange, METH_O, NULL}, { (char *)"RichTextCtrl_SetSelectionRange", (PyCFunction) _wrap_RichTextCtrl_SetSelectionRange, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetInternalSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetInternalSelectionRange, METH_O, NULL}, @@ -11827,6 +11966,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"RichTextCtrl_ApplyAlignmentToSelection", (PyCFunction) _wrap_RichTextCtrl_ApplyAlignmentToSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_SetStyleSheet", (PyCFunction) _wrap_RichTextCtrl_SetStyleSheet, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_GetStyleSheet", (PyCFunction)_wrap_RichTextCtrl_GetStyleSheet, METH_O, NULL}, + { (char *)"RichTextCtrl_ApplyStyleSheet", (PyCFunction) _wrap_RichTextCtrl_ApplyStyleSheet, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RichTextCtrl_swigregister", RichTextCtrl_swigregister, METH_VARARGS, NULL}, { (char *)"RichTextCtrl_swiginit", RichTextCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_RichTextEvent", (PyCFunction) _wrap_new_RichTextEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -13962,6 +14102,8 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "RICHTEXT_HITTEST_ON",SWIG_From_int(static_cast< int >(wxRICHTEXT_HITTEST_ON))); SWIG_Python_SetConstant(d, "RICHTEXT_FORMATTED",SWIG_From_int(static_cast< int >(wxRICHTEXT_FORMATTED))); SWIG_Python_SetConstant(d, "RICHTEXT_UNFORMATTED",SWIG_From_int(static_cast< int >(wxRICHTEXT_UNFORMATTED))); + SWIG_Python_SetConstant(d, "RICHTEXT_INSERT_NONE",SWIG_From_int(static_cast< int >(wxRICHTEXT_INSERT_NONE))); + SWIG_Python_SetConstant(d, "RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE",SWIG_From_int(static_cast< int >(wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE))); SWIG_Python_SetConstant(d, "TEXT_ATTR_TEXT_COLOUR",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_TEXT_COLOUR))); SWIG_Python_SetConstant(d, "TEXT_ATTR_BACKGROUND_COLOUR",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_BACKGROUND_COLOUR))); SWIG_Python_SetConstant(d, "TEXT_ATTR_FONT_FACE",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_FONT_FACE))); -- 2.45.2