From ddeca22ce86e16e0d67e1a7dd2102c8251ab4792 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 2 Apr 2007 21:37:01 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_controls.py | 51 +++ wxPython/src/gtk/_controls_wrap.cpp | 124 ++++++ wxPython/src/gtk/_core.py | 96 +++-- wxPython/src/gtk/_core_wrap.cpp | 270 ++++++++++++-- wxPython/src/gtk/_gdi.py | 18 +- wxPython/src/gtk/_gdi_wrap.cpp | 559 +++++++++++++++------------- wxPython/src/gtk/_misc.py | 17 +- wxPython/src/gtk/_misc_wrap.cpp | 31 ++ wxPython/src/gtk/_windows.py | 10 +- wxPython/src/mac/_controls.py | 51 +++ wxPython/src/mac/_controls_wrap.cpp | 124 ++++++ wxPython/src/mac/_core.py | 84 +++-- wxPython/src/mac/_core_wrap.cpp | 226 +++++++++-- wxPython/src/mac/_misc.py | 17 +- wxPython/src/mac/_misc_wrap.cpp | 31 ++ wxPython/src/mac/_windows.py | 10 +- wxPython/src/msw/_controls.py | 51 +++ wxPython/src/msw/_controls_wrap.cpp | 124 ++++++ wxPython/src/msw/_core.py | 84 +++-- wxPython/src/msw/_core_wrap.cpp | 226 +++++++++-- wxPython/src/msw/_misc.py | 17 +- wxPython/src/msw/_misc_wrap.cpp | 31 ++ wxPython/src/msw/_windows.py | 10 +- 23 files changed, 1804 insertions(+), 458 deletions(-) diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index 8fcc6817ca..8cc31cd75b 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -1122,6 +1122,11 @@ def StaticLine_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +ST_NO_AUTORESIZE = _controls_.ST_NO_AUTORESIZE +ST_MARKUP = _controls_.ST_MARKUP +ST_ELLIPSIZE_START = _controls_.ST_ELLIPSIZE_START +ST_ELLIPSIZE_MIDDLE = _controls_.ST_ELLIPSIZE_MIDDLE +ST_ELLIPSIZE_END = _controls_.ST_ELLIPSIZE_END class StaticText(_core.Control): """Proxy of C++ StaticText class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -1154,6 +1159,32 @@ class StaticText(_core.Control): """ return _controls_.StaticText_Wrap(*args, **kwargs) + def IsEllipsized(*args, **kwargs): + """IsEllipsized(self) -> bool""" + return _controls_.StaticText_IsEllipsized(*args, **kwargs) + + def RemoveMarkup(*args, **kwargs): + """ + RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + + RemoveMarkup = staticmethod(RemoveMarkup) + def EscapeMarkup(*args, **kwargs): + """ + EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + + EscapeMarkup = staticmethod(EscapeMarkup) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -1179,6 +1210,26 @@ def PreStaticText(*args, **kwargs): val = _controls_.new_PreStaticText(*args, **kwargs) return val +def StaticText_RemoveMarkup(*args, **kwargs): + """ + StaticText_RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + +def StaticText_EscapeMarkup(*args, **kwargs): + """ + StaticText_EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + def StaticText_GetClassDefaultAttributes(*args, **kwargs): """ StaticText_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 6a4ca84410..09bab23608 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -8395,6 +8395,122 @@ fail: } +SWIGINTERN PyObject *_wrap_StaticText_IsEllipsized(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStaticText *arg1 = (wxStaticText *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStaticText, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StaticText_IsEllipsized" "', expected argument " "1"" of type '" "wxStaticText const *""'"); + } + arg1 = reinterpret_cast< wxStaticText * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxStaticText const *)arg1)->IsEllipsized(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_StaticText_RemoveMarkup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticText_RemoveMarkup",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxStaticText::RemoveMarkup((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_StaticText_EscapeMarkup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticText_EscapeMarkup",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxStaticText::EscapeMarkup((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_StaticText_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -47126,6 +47242,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PreStaticText", (PyCFunction)_wrap_new_PreStaticText, METH_NOARGS, NULL}, { (char *)"StaticText_Create", (PyCFunction) _wrap_StaticText_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_Wrap", (PyCFunction) _wrap_StaticText_Wrap, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"StaticText_IsEllipsized", (PyCFunction)_wrap_StaticText_IsEllipsized, METH_O, NULL}, + { (char *)"StaticText_RemoveMarkup", (PyCFunction) _wrap_StaticText_RemoveMarkup, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"StaticText_EscapeMarkup", (PyCFunction) _wrap_StaticText_EscapeMarkup, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticText_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_swigregister", StaticText_swigregister, METH_VARARGS, NULL}, { (char *)"StaticText_swiginit", StaticText_swiginit, METH_VARARGS, NULL}, @@ -50590,6 +50709,11 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticLineNameStr",StaticLineNameStr_get, StaticLineNameStr_set); + SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE))); + SWIG_Python_SetConstant(d, "ST_MARKUP",SWIG_From_int(static_cast< int >(wxST_MARKUP))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_START",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_START))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_MIDDLE",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_MIDDLE))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_END",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_END))); SWIG_addvarlink(SWIG_globals(),(char*)"ListBoxNameStr",ListBoxNameStr_get, ListBoxNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"TextCtrlNameStr",TextCtrlNameStr_get, TextCtrlNameStr_set); SWIG_Python_SetConstant(d, "TE_NO_VSCROLL",SWIG_From_int(static_cast< int >(wxTE_NO_VSCROLL))); diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index fe25db7e47..d57326521b 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -131,9 +131,6 @@ SB_HORIZONTAL = _core_.SB_HORIZONTAL SB_VERTICAL = _core_.SB_VERTICAL RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX ST_SIZEGRIP = _core_.ST_SIZEGRIP -ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE -ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE -ST_DOTS_END = _core_.ST_DOTS_END FLOOD_SURFACE = _core_.FLOOD_SURFACE FLOOD_BORDER = _core_.FLOOD_BORDER ODDEVEN_RULE = _core_.ODDEVEN_RULE @@ -9094,12 +9091,20 @@ class Window(EvtHandler): """ return _core_.Window_CanAcceptFocusFromKeyboard(*args, **kwargs) + def NavigateIn(*args, **kwargs): + """ + NavigateIn(self, int flags=NavigationKeyEvent.IsForward) -> bool + + Navigates inside this window. + """ + return _core_.Window_NavigateIn(*args, **kwargs) + def Navigate(*args, **kwargs): """ Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool - Does keyboard navigation from this window to another, by sending a - `wx.NavigationKeyEvent`. + Does keyboard navigation starting from this window to another. This is + equivalient to self.GetParent().NavigateIn(). """ return _core_.Window_Navigate(*args, **kwargs) @@ -11385,6 +11390,15 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) + def RemoveMnemonics(*args, **kwargs): + """ + RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + + RemoveMnemonics = staticmethod(RemoveMnemonics) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11417,6 +11431,14 @@ def PreControl(*args, **kwargs): val = _core_.new_PreControl(*args, **kwargs) return val +def Control_RemoveMnemonics(*args, **kwargs): + """ + Control_RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + def Control_GetClassDefaultAttributes(*args, **kwargs): """ Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -12072,14 +12094,6 @@ class SizerItem(Object): """ return _core_.SizerItem_GetWindow(*args, **kwargs) - def SetWindow(*args, **kwargs): - """ - SetWindow(self, Window window) - - Set the window to be managed by this sizer item. - """ - return _core_.SizerItem_SetWindow(*args, **kwargs) - def GetSizer(*args, **kwargs): """ GetSizer(self) -> Sizer @@ -12088,6 +12102,22 @@ class SizerItem(Object): """ return _core_.SizerItem_GetSizer(*args, **kwargs) + def GetSpacer(*args, **kwargs): + """ + GetSpacer(self) -> Size + + Get the size of the spacer managed by this sizer item. + """ + return _core_.SizerItem_GetSpacer(*args, **kwargs) + + def SetWindow(*args, **kwargs): + """ + SetWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_SetWindow(*args, **kwargs) + def SetSizer(*args, **kwargs): """ SetSizer(self, Sizer sizer) @@ -12096,21 +12126,41 @@ class SizerItem(Object): """ return _core_.SizerItem_SetSizer(*args, **kwargs) - def GetSpacer(*args, **kwargs): + def SetSpacer(*args, **kwargs): """ - GetSpacer(self) -> Size + SetSpacer(self, Size size) - Get the size of the spacer managed by this sizer item. + Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_GetSpacer(*args, **kwargs) + return _core_.SizerItem_SetSpacer(*args, **kwargs) - def SetSpacer(*args, **kwargs): + SetWindow = wx._deprecated(SetWindow, "Use `AssignWindow` instead.") + SetSizer = wx._deprecated(SetSizer, "Use `AssignSizer` instead.") + SetSpacer = wx._deprecated(SetSpacer, "Use `AssignSpacer` instead.") + + def AssignWindow(*args, **kwargs): """ - SetSpacer(self, Size size) + AssignWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_AssignWindow(*args, **kwargs) + + def AssignSizer(*args, **kwargs): + """ + AssignSizer(self, Sizer sizer) + + Set the subsizer to be managed by this sizer item. + """ + return _core_.SizerItem_AssignSizer(*args, **kwargs) + + def AssignSpacer(*args, **kwargs): + """ + AssignSpacer(self, Size size) Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_SetSpacer(*args, **kwargs) + return _core_.SizerItem_AssignSpacer(*args, **kwargs) def Show(*args, **kwargs): """ @@ -12164,10 +12214,10 @@ class SizerItem(Object): Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") Rect = property(GetRect,doc="See `GetRect`") Size = property(GetSize,doc="See `GetSize`") - Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") - Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + Sizer = property(GetSizer,AssignSizer,doc="See `GetSizer` and `AssignSizer`") + Spacer = property(GetSpacer,AssignSpacer,doc="See `GetSpacer` and `AssignSpacer`") UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") - Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") + Window = property(GetWindow,AssignWindow,doc="See `GetWindow` and `AssignWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index 464965772b..d88306aa7b 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -36464,6 +36464,49 @@ fail: } +SWIGINTERN PyObject *_wrap_Window_NavigateIn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) wxNavigationKeyEvent::IsForward ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Window_NavigateIn",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_NavigateIn" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_NavigateIn" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->NavigateIn(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_Window_Navigate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; @@ -47906,6 +47949,49 @@ fail: } +SWIGINTERN PyObject *_wrap_Control_RemoveMnemonics(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Control_RemoveMnemonics",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxControl::RemoveMnemonics((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -50457,6 +50543,64 @@ fail: } +SWIGINTERN PyObject *_wrap_SizerItem_GetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSizer *result = 0 ; + 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_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizer *)(arg1)->GetSizer(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerItem_GetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSize 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_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetSpacer(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_SizerItem_SetWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; @@ -50495,62 +50639,106 @@ fail: } -SWIGINTERN PyObject *_wrap_SizerItem_GetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SizerItem_SetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSizer *result = 0 ; + wxSizer *arg2 = (wxSizer *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "sizer", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); + res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxSizer, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_SetSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSizer *)(arg1)->GetSizer(); + (arg1)->SetSizer(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSize *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); { - resultobj = wxPyMake_wxObject(result, (bool)0); + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSpacer((wxSize const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; } + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_SizerItem_SetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSizer *arg2 = (wxSizer *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; int res2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "sizer", NULL + (char *) "self",(char *) "window", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignWindow",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignWindow" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); - res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxSizer, SWIG_POINTER_DISOWN | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_SetSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_AssignWindow" "', expected argument " "2"" of type '" "wxWindow *""'"); } + arg2 = reinterpret_cast< wxWindow * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSizer(arg2); + (arg1)->AssignWindow(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -50561,35 +50749,45 @@ fail: } -SWIGINTERN PyObject *_wrap_SizerItem_GetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSize result; + wxSizer *arg2 = (wxSizer *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "sizer", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignSizer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_AssignSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + } + arg2 = reinterpret_cast< wxSizer * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetSpacer(); + (arg1)->AssignSizer(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; wxSize *arg2 = 0 ; @@ -50602,10 +50800,10 @@ SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), P (char *) "self",(char *) "size", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignSpacer",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); { @@ -50614,7 +50812,7 @@ SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSpacer((wxSize const &)*arg2); + (arg1)->AssignSpacer((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -58679,6 +58877,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_CanAcceptFocus", (PyCFunction)_wrap_Window_CanAcceptFocus, METH_O, NULL}, { (char *)"Window_AcceptsFocusFromKeyboard", (PyCFunction)_wrap_Window_AcceptsFocusFromKeyboard, METH_O, NULL}, { (char *)"Window_CanAcceptFocusFromKeyboard", (PyCFunction)_wrap_Window_CanAcceptFocusFromKeyboard, METH_O, NULL}, + { (char *)"Window_NavigateIn", (PyCFunction) _wrap_Window_NavigateIn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_Navigate", (PyCFunction) _wrap_Window_Navigate, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_MoveAfterInTabOrder", (PyCFunction) _wrap_Window_MoveAfterInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_MoveBeforeInTabOrder", (PyCFunction) _wrap_Window_MoveBeforeInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -58970,6 +59169,7 @@ 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_RemoveMnemonics", (PyCFunction) _wrap_Control_RemoveMnemonics, METH_VARARGS | METH_KEYWORDS, 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}, @@ -59045,11 +59245,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"SizerItem_SetBorder", (PyCFunction) _wrap_SizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetBorder", (PyCFunction)_wrap_SizerItem_GetBorder, METH_O, NULL}, { (char *)"SizerItem_GetWindow", (PyCFunction)_wrap_SizerItem_GetWindow, METH_O, NULL}, - { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetSizer", (PyCFunction)_wrap_SizerItem_GetSizer, METH_O, NULL}, - { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetSpacer", (PyCFunction)_wrap_SizerItem_GetSpacer, METH_O, NULL}, + { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_SetSpacer", (PyCFunction) _wrap_SizerItem_SetSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignWindow", (PyCFunction) _wrap_SizerItem_AssignWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignSizer", (PyCFunction) _wrap_SizerItem_AssignSizer, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignSpacer", (PyCFunction) _wrap_SizerItem_AssignSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_Show", (PyCFunction) _wrap_SizerItem_Show, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_IsShown", (PyCFunction)_wrap_SizerItem_IsShown, METH_O, NULL}, { (char *)"SizerItem_GetPosition", (PyCFunction)_wrap_SizerItem_GetPosition, METH_O, NULL}, @@ -60904,9 +61107,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "SB_VERTICAL",SWIG_From_int(static_cast< int >(wxSB_VERTICAL))); SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX))); SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP))); - SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE))); - SWIG_Python_SetConstant(d, "ST_DOTS_MIDDLE",SWIG_From_int(static_cast< int >(wxST_DOTS_MIDDLE))); - SWIG_Python_SetConstant(d, "ST_DOTS_END",SWIG_From_int(static_cast< int >(wxST_DOTS_END))); SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE))); SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER))); SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE))); diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 532073c7fb..eee7429773 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -2634,9 +2634,8 @@ class Locale(object): __del__ = lambda self : None; def Init1(*args, **kwargs): """ - Init1(self, String szName, String szShort=EmptyString, String szLocale=EmptyString, - bool bLoadDefault=True, - bool bConvertEncoding=False) -> bool + Init1(self, String name, String shortName=EmptyString, String locale=EmptyString, + bool bLoadDefault=True, bool bConvertEncoding=False) -> bool """ return _gdi_.Locale_Init1(*args, **kwargs) @@ -2693,7 +2692,7 @@ class Locale(object): AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix) def AddCatalog(*args, **kwargs): - """AddCatalog(self, String szDomain) -> bool""" + """AddCatalog(self, String domain) -> bool""" return _gdi_.Locale_AddCatalog(*args, **kwargs) def IsAvailable(*args, **kwargs): @@ -2702,7 +2701,7 @@ class Locale(object): IsAvailable = staticmethod(IsAvailable) def IsLoaded(*args, **kwargs): - """IsLoaded(self, String szDomain) -> bool""" + """IsLoaded(self, String domain) -> bool""" return _gdi_.Locale_IsLoaded(*args, **kwargs) def GetLanguageInfo(*args, **kwargs): @@ -2726,7 +2725,7 @@ class Locale(object): AddLanguage = staticmethod(AddLanguage) def GetString(*args, **kwargs): - """GetString(self, String szOrigString, String szDomain=EmptyString) -> String""" + """GetString(self, String origString, String domain=EmptyString) -> String""" return _gdi_.Locale_GetString(*args, **kwargs) def GetName(*args, **kwargs): @@ -2793,14 +2792,11 @@ class PyLocale(Locale): return _gdi_.PyLocale__setCallbackInfo(*args, **kwargs) def GetSingularString(*args, **kwargs): - """GetSingularString(self, wxChar szOrigString, wxChar szDomain=None) -> wxChar""" + """GetSingularString(self, String origString, String domain=EmptyString) -> String""" return _gdi_.PyLocale_GetSingularString(*args, **kwargs) def GetPluralString(*args, **kwargs): - """ - GetPluralString(self, wxChar szOrigString, wxChar szOrigString2, size_t n, - wxChar szDomain=None) -> wxChar - """ + """GetPluralString(self, String origString, String origString2, size_t n, String domain=EmptyString) -> String""" return _gdi_.PyLocale_GetPluralString(*args, **kwargs) _gdi_.PyLocale_swigregister(PyLocale) diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index 43dadd1f5b..b055a6547a 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -2486,155 +2486,154 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxBufferedDC swig_types[20] #define SWIGTYPE_p_wxBufferedPaintDC swig_types[21] #define SWIGTYPE_p_wxCURHandler swig_types[22] -#define SWIGTYPE_p_wxChar swig_types[23] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[24] -#define SWIGTYPE_p_wxClientDC swig_types[25] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[26] -#define SWIGTYPE_p_wxCloseEvent swig_types[27] -#define SWIGTYPE_p_wxColour swig_types[28] -#define SWIGTYPE_p_wxColourDatabase swig_types[29] -#define SWIGTYPE_p_wxCommandEvent swig_types[30] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[31] -#define SWIGTYPE_p_wxControl swig_types[32] -#define SWIGTYPE_p_wxControlWithItems swig_types[33] -#define SWIGTYPE_p_wxCursor swig_types[34] -#define SWIGTYPE_p_wxDC swig_types[35] -#define SWIGTYPE_p_wxDCBrushChanger swig_types[36] -#define SWIGTYPE_p_wxDCClipper swig_types[37] -#define SWIGTYPE_p_wxDCOverlay swig_types[38] -#define SWIGTYPE_p_wxDCPenChanger swig_types[39] -#define SWIGTYPE_p_wxDCTextColourChanger swig_types[40] -#define SWIGTYPE_p_wxDash swig_types[41] -#define SWIGTYPE_p_wxDateEvent swig_types[42] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[43] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[44] -#define SWIGTYPE_p_wxDuplexMode swig_types[45] -#define SWIGTYPE_p_wxEffects swig_types[46] -#define SWIGTYPE_p_wxEncodingConverter swig_types[47] -#define SWIGTYPE_p_wxEraseEvent swig_types[48] -#define SWIGTYPE_p_wxEvent swig_types[49] -#define SWIGTYPE_p_wxEventBlocker swig_types[50] -#define SWIGTYPE_p_wxEvtHandler swig_types[51] -#define SWIGTYPE_p_wxFSFile swig_types[52] -#define SWIGTYPE_p_wxFileSystem swig_types[53] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[54] -#define SWIGTYPE_p_wxFocusEvent swig_types[55] -#define SWIGTYPE_p_wxFont swig_types[56] -#define SWIGTYPE_p_wxFontList swig_types[57] -#define SWIGTYPE_p_wxFontMapper swig_types[58] -#define SWIGTYPE_p_wxGBSizerItem swig_types[59] -#define SWIGTYPE_p_wxGCDC swig_types[60] -#define SWIGTYPE_p_wxGDIObjListBase swig_types[61] -#define SWIGTYPE_p_wxGDIObject swig_types[62] -#define SWIGTYPE_p_wxGIFHandler swig_types[63] -#define SWIGTYPE_p_wxGraphicsBrush swig_types[64] -#define SWIGTYPE_p_wxGraphicsContext swig_types[65] -#define SWIGTYPE_p_wxGraphicsFont swig_types[66] -#define SWIGTYPE_p_wxGraphicsMatrix swig_types[67] -#define SWIGTYPE_p_wxGraphicsObject swig_types[68] -#define SWIGTYPE_p_wxGraphicsPath swig_types[69] -#define SWIGTYPE_p_wxGraphicsPen swig_types[70] -#define SWIGTYPE_p_wxGraphicsRenderer swig_types[71] -#define SWIGTYPE_p_wxGridBagSizer swig_types[72] -#define SWIGTYPE_p_wxGridSizer swig_types[73] -#define SWIGTYPE_p_wxHeaderButtonParams swig_types[74] -#define SWIGTYPE_p_wxICOHandler swig_types[75] -#define SWIGTYPE_p_wxIcon swig_types[76] -#define SWIGTYPE_p_wxIconBundle swig_types[77] -#define SWIGTYPE_p_wxIconLocation swig_types[78] -#define SWIGTYPE_p_wxIconizeEvent swig_types[79] -#define SWIGTYPE_p_wxIdleEvent swig_types[80] -#define SWIGTYPE_p_wxImage swig_types[81] -#define SWIGTYPE_p_wxImageHandler swig_types[82] -#define SWIGTYPE_p_wxImageList swig_types[83] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[84] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[85] -#define SWIGTYPE_p_wxJPEGHandler swig_types[86] -#define SWIGTYPE_p_wxKeyEvent swig_types[87] -#define SWIGTYPE_p_wxLanguageInfo swig_types[88] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[89] -#define SWIGTYPE_p_wxLocale swig_types[90] -#define SWIGTYPE_p_wxMask swig_types[91] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[92] -#define SWIGTYPE_p_wxMemoryDC swig_types[93] -#define SWIGTYPE_p_wxMenu swig_types[94] -#define SWIGTYPE_p_wxMenuBar swig_types[95] -#define SWIGTYPE_p_wxMenuEvent swig_types[96] -#define SWIGTYPE_p_wxMenuItem swig_types[97] -#define SWIGTYPE_p_wxMetaFile swig_types[98] -#define SWIGTYPE_p_wxMetaFileDC swig_types[99] -#define SWIGTYPE_p_wxMirrorDC swig_types[100] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[101] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[102] -#define SWIGTYPE_p_wxMouseEvent swig_types[103] -#define SWIGTYPE_p_wxMoveEvent swig_types[104] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[105] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[106] -#define SWIGTYPE_p_wxNativePixelData swig_types[107] -#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[108] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[109] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[110] -#define SWIGTYPE_p_wxNotifyEvent swig_types[111] -#define SWIGTYPE_p_wxObject swig_types[112] -#define SWIGTYPE_p_wxOverlay swig_types[113] -#define SWIGTYPE_p_wxPCXHandler swig_types[114] -#define SWIGTYPE_p_wxPNGHandler swig_types[115] -#define SWIGTYPE_p_wxPNMHandler swig_types[116] -#define SWIGTYPE_p_wxPaintDC swig_types[117] -#define SWIGTYPE_p_wxPaintEvent swig_types[118] -#define SWIGTYPE_p_wxPalette swig_types[119] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[120] -#define SWIGTYPE_p_wxPaperSize swig_types[121] -#define SWIGTYPE_p_wxPen swig_types[122] -#define SWIGTYPE_p_wxPenList swig_types[123] -#define SWIGTYPE_p_wxPixelDataBase swig_types[124] -#define SWIGTYPE_p_wxPoint swig_types[125] -#define SWIGTYPE_p_wxPoint2D swig_types[126] -#define SWIGTYPE_p_wxPostScriptDC swig_types[127] -#define SWIGTYPE_p_wxPrintData swig_types[128] -#define SWIGTYPE_p_wxPrinterDC swig_types[129] -#define SWIGTYPE_p_wxPseudoDC swig_types[130] -#define SWIGTYPE_p_wxPyApp swig_types[131] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[132] -#define SWIGTYPE_p_wxPyEvent swig_types[133] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[134] -#define SWIGTYPE_p_wxPyImageHandler swig_types[135] -#define SWIGTYPE_p_wxPyLocale swig_types[136] -#define SWIGTYPE_p_wxPySizer swig_types[137] -#define SWIGTYPE_p_wxPyValidator swig_types[138] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[139] -#define SWIGTYPE_p_wxRect swig_types[140] -#define SWIGTYPE_p_wxRect2D swig_types[141] -#define SWIGTYPE_p_wxRegion swig_types[142] -#define SWIGTYPE_p_wxRegionIterator swig_types[143] -#define SWIGTYPE_p_wxRendererNative swig_types[144] -#define SWIGTYPE_p_wxRendererVersion swig_types[145] -#define SWIGTYPE_p_wxScreenDC swig_types[146] -#define SWIGTYPE_p_wxScrollEvent swig_types[147] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[148] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[149] -#define SWIGTYPE_p_wxShowEvent swig_types[150] -#define SWIGTYPE_p_wxSize swig_types[151] -#define SWIGTYPE_p_wxSizeEvent swig_types[152] -#define SWIGTYPE_p_wxSizer swig_types[153] -#define SWIGTYPE_p_wxSizerItem swig_types[154] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[155] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[156] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[157] -#define SWIGTYPE_p_wxStockGDI swig_types[158] -#define SWIGTYPE_p_wxString swig_types[159] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[160] -#define SWIGTYPE_p_wxTGAHandler swig_types[161] -#define SWIGTYPE_p_wxTIFFHandler swig_types[162] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[163] -#define SWIGTYPE_p_wxValidator swig_types[164] -#define SWIGTYPE_p_wxWindow swig_types[165] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[166] -#define SWIGTYPE_p_wxWindowDC swig_types[167] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[168] -#define SWIGTYPE_p_wxXPMHandler swig_types[169] -static swig_type_info *swig_types[171]; -static swig_module_info swig_module = {swig_types, 170, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxChildFocusEvent swig_types[23] +#define SWIGTYPE_p_wxClientDC swig_types[24] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[25] +#define SWIGTYPE_p_wxCloseEvent swig_types[26] +#define SWIGTYPE_p_wxColour swig_types[27] +#define SWIGTYPE_p_wxColourDatabase swig_types[28] +#define SWIGTYPE_p_wxCommandEvent swig_types[29] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[30] +#define SWIGTYPE_p_wxControl swig_types[31] +#define SWIGTYPE_p_wxControlWithItems swig_types[32] +#define SWIGTYPE_p_wxCursor swig_types[33] +#define SWIGTYPE_p_wxDC swig_types[34] +#define SWIGTYPE_p_wxDCBrushChanger swig_types[35] +#define SWIGTYPE_p_wxDCClipper swig_types[36] +#define SWIGTYPE_p_wxDCOverlay swig_types[37] +#define SWIGTYPE_p_wxDCPenChanger swig_types[38] +#define SWIGTYPE_p_wxDCTextColourChanger swig_types[39] +#define SWIGTYPE_p_wxDash swig_types[40] +#define SWIGTYPE_p_wxDateEvent swig_types[41] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[42] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[43] +#define SWIGTYPE_p_wxDuplexMode swig_types[44] +#define SWIGTYPE_p_wxEffects swig_types[45] +#define SWIGTYPE_p_wxEncodingConverter swig_types[46] +#define SWIGTYPE_p_wxEraseEvent swig_types[47] +#define SWIGTYPE_p_wxEvent swig_types[48] +#define SWIGTYPE_p_wxEventBlocker swig_types[49] +#define SWIGTYPE_p_wxEvtHandler swig_types[50] +#define SWIGTYPE_p_wxFSFile swig_types[51] +#define SWIGTYPE_p_wxFileSystem swig_types[52] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[53] +#define SWIGTYPE_p_wxFocusEvent swig_types[54] +#define SWIGTYPE_p_wxFont swig_types[55] +#define SWIGTYPE_p_wxFontList swig_types[56] +#define SWIGTYPE_p_wxFontMapper swig_types[57] +#define SWIGTYPE_p_wxGBSizerItem swig_types[58] +#define SWIGTYPE_p_wxGCDC swig_types[59] +#define SWIGTYPE_p_wxGDIObjListBase swig_types[60] +#define SWIGTYPE_p_wxGDIObject swig_types[61] +#define SWIGTYPE_p_wxGIFHandler swig_types[62] +#define SWIGTYPE_p_wxGraphicsBrush swig_types[63] +#define SWIGTYPE_p_wxGraphicsContext swig_types[64] +#define SWIGTYPE_p_wxGraphicsFont swig_types[65] +#define SWIGTYPE_p_wxGraphicsMatrix swig_types[66] +#define SWIGTYPE_p_wxGraphicsObject swig_types[67] +#define SWIGTYPE_p_wxGraphicsPath swig_types[68] +#define SWIGTYPE_p_wxGraphicsPen swig_types[69] +#define SWIGTYPE_p_wxGraphicsRenderer swig_types[70] +#define SWIGTYPE_p_wxGridBagSizer swig_types[71] +#define SWIGTYPE_p_wxGridSizer swig_types[72] +#define SWIGTYPE_p_wxHeaderButtonParams swig_types[73] +#define SWIGTYPE_p_wxICOHandler swig_types[74] +#define SWIGTYPE_p_wxIcon swig_types[75] +#define SWIGTYPE_p_wxIconBundle swig_types[76] +#define SWIGTYPE_p_wxIconLocation swig_types[77] +#define SWIGTYPE_p_wxIconizeEvent swig_types[78] +#define SWIGTYPE_p_wxIdleEvent swig_types[79] +#define SWIGTYPE_p_wxImage swig_types[80] +#define SWIGTYPE_p_wxImageHandler swig_types[81] +#define SWIGTYPE_p_wxImageList swig_types[82] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[83] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[84] +#define SWIGTYPE_p_wxJPEGHandler swig_types[85] +#define SWIGTYPE_p_wxKeyEvent swig_types[86] +#define SWIGTYPE_p_wxLanguageInfo swig_types[87] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[88] +#define SWIGTYPE_p_wxLocale swig_types[89] +#define SWIGTYPE_p_wxMask swig_types[90] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[91] +#define SWIGTYPE_p_wxMemoryDC swig_types[92] +#define SWIGTYPE_p_wxMenu swig_types[93] +#define SWIGTYPE_p_wxMenuBar swig_types[94] +#define SWIGTYPE_p_wxMenuEvent swig_types[95] +#define SWIGTYPE_p_wxMenuItem swig_types[96] +#define SWIGTYPE_p_wxMetaFile swig_types[97] +#define SWIGTYPE_p_wxMetaFileDC swig_types[98] +#define SWIGTYPE_p_wxMirrorDC swig_types[99] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[100] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[101] +#define SWIGTYPE_p_wxMouseEvent swig_types[102] +#define SWIGTYPE_p_wxMoveEvent swig_types[103] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[104] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[105] +#define SWIGTYPE_p_wxNativePixelData swig_types[106] +#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[107] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[108] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[109] +#define SWIGTYPE_p_wxNotifyEvent swig_types[110] +#define SWIGTYPE_p_wxObject swig_types[111] +#define SWIGTYPE_p_wxOverlay swig_types[112] +#define SWIGTYPE_p_wxPCXHandler swig_types[113] +#define SWIGTYPE_p_wxPNGHandler swig_types[114] +#define SWIGTYPE_p_wxPNMHandler swig_types[115] +#define SWIGTYPE_p_wxPaintDC swig_types[116] +#define SWIGTYPE_p_wxPaintEvent swig_types[117] +#define SWIGTYPE_p_wxPalette swig_types[118] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[119] +#define SWIGTYPE_p_wxPaperSize swig_types[120] +#define SWIGTYPE_p_wxPen swig_types[121] +#define SWIGTYPE_p_wxPenList swig_types[122] +#define SWIGTYPE_p_wxPixelDataBase swig_types[123] +#define SWIGTYPE_p_wxPoint swig_types[124] +#define SWIGTYPE_p_wxPoint2D swig_types[125] +#define SWIGTYPE_p_wxPostScriptDC swig_types[126] +#define SWIGTYPE_p_wxPrintData swig_types[127] +#define SWIGTYPE_p_wxPrinterDC swig_types[128] +#define SWIGTYPE_p_wxPseudoDC swig_types[129] +#define SWIGTYPE_p_wxPyApp swig_types[130] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[131] +#define SWIGTYPE_p_wxPyEvent swig_types[132] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[133] +#define SWIGTYPE_p_wxPyImageHandler swig_types[134] +#define SWIGTYPE_p_wxPyLocale swig_types[135] +#define SWIGTYPE_p_wxPySizer swig_types[136] +#define SWIGTYPE_p_wxPyValidator swig_types[137] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[138] +#define SWIGTYPE_p_wxRect swig_types[139] +#define SWIGTYPE_p_wxRect2D swig_types[140] +#define SWIGTYPE_p_wxRegion swig_types[141] +#define SWIGTYPE_p_wxRegionIterator swig_types[142] +#define SWIGTYPE_p_wxRendererNative swig_types[143] +#define SWIGTYPE_p_wxRendererVersion swig_types[144] +#define SWIGTYPE_p_wxScreenDC swig_types[145] +#define SWIGTYPE_p_wxScrollEvent swig_types[146] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[147] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[148] +#define SWIGTYPE_p_wxShowEvent swig_types[149] +#define SWIGTYPE_p_wxSize swig_types[150] +#define SWIGTYPE_p_wxSizeEvent swig_types[151] +#define SWIGTYPE_p_wxSizer swig_types[152] +#define SWIGTYPE_p_wxSizerItem swig_types[153] +#define SWIGTYPE_p_wxSplitterRenderParams swig_types[154] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[155] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[156] +#define SWIGTYPE_p_wxStockGDI swig_types[157] +#define SWIGTYPE_p_wxString swig_types[158] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[159] +#define SWIGTYPE_p_wxTGAHandler swig_types[160] +#define SWIGTYPE_p_wxTIFFHandler swig_types[161] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[162] +#define SWIGTYPE_p_wxValidator swig_types[163] +#define SWIGTYPE_p_wxWindow swig_types[164] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[165] +#define SWIGTYPE_p_wxWindowDC swig_types[166] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[167] +#define SWIGTYPE_p_wxXPMHandler swig_types[168] +static swig_type_info *swig_types[170]; +static swig_module_info swig_module = {swig_types, 169, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3371,8 +3370,8 @@ SWIGINTERN wxLocale *new_wxLocale(int language=-1,int flags=wxLOCALE_LOAD_DEFAUL #endif return loc; } -SWIGINTERN bool wxLocale_Init1(wxLocale *self,wxString const &szName,wxString const &szShort=wxPyEmptyString,wxString const &szLocale=wxPyEmptyString,bool bLoadDefault=true,bool bConvertEncoding=false){ - bool rc = self->Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding); +SWIGINTERN bool wxLocale_Init1(wxLocale *self,wxString const &name,wxString const &shortName=wxPyEmptyString,wxString const &locale=wxPyEmptyString,bool bLoadDefault=true,bool bConvertEncoding=false){ + bool rc = self->Init(name, shortName, locale, bLoadDefault, bConvertEncoding); // Python before 2.4 needs to have LC_NUMERIC set to "C" in order // for the floating point conversions and such to work right. #if PY_VERSION_HEX < 0x02040000 @@ -3395,28 +3394,31 @@ class wxPyLocale : public wxLocale public: wxPyLocale(); - wxPyLocale(const wxChar *szName, // name (for messages) - const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files) - const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale) - bool bLoadDefault = true, // preload wxstd.mo? - bool bConvertEncoding = false); // convert Win<->Unix if necessary? + wxPyLocale(const wxString& name, // name (for messages) + const wxString& shortName = wxPyEmptyString, // dir prefix (for msg files) + const wxString& locale = wxPyEmptyString, // locale (for setlocale) + bool bLoadDefault = true, // preload wxstd.mo? + bool bConvertEncoding = false); // convert Win<->Unix if necessary? wxPyLocale(int language, // wxLanguage id or custom language - int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); + int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); ~wxPyLocale(); - virtual const wxChar *GetString(const wxChar *szOrigString, - const wxChar *szDomain = NULL) const; - virtual const wxChar *GetString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain = NULL) const; - - virtual const wxChar *GetSingularString(const wxChar *szOrigString, - const wxChar *szDomain = NULL) const; - virtual const wxChar *GetPluralString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain = NULL) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& domain = wxPyEmptyString) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& origString2, + size_t n, + const wxString& domain = wxPyEmptyString) const; + + virtual const wxString& GetSingularString(const wxString& origString, + const wxString& domain = wxPyEmptyString) const; + virtual const wxString& GetPluralString(const wxString& origString, + const wxString& origString2, + size_t n, + const wxString& domain = wxPyEmptyString) const; + PYPRIVATE; private: @@ -3427,12 +3429,12 @@ wxPyLocale::wxPyLocale() : wxLocale() { } -wxPyLocale::wxPyLocale(const wxChar *szName, // name (for messages) - const wxChar *szShort, // dir prefix (for msg files) - const wxChar *szLocale, // locale (for setlocale) - bool bLoadDefault, // preload wxstd.mo? - bool bConvertEncoding) // convert Win<->Unix if necessary? - : wxLocale(szName, szShort, szLocale, bLoadDefault, bConvertEncoding) +wxPyLocale::wxPyLocale(const wxString& name, // name (for messages) + const wxString& shortName, // dir prefix (for msg files) + const wxString& locale, // locale (for setlocale) + bool bLoadDefault, // preload wxstd.mo? + bool bConvertEncoding) // convert Win<->Unix if necessary? + : wxLocale(name, shortName, locale, bLoadDefault, bConvertEncoding) { } @@ -3445,31 +3447,29 @@ wxPyLocale::~wxPyLocale() { } -const wxChar *wxPyLocale::GetString(const wxChar *szOrigString, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetString(const wxString& origString, + const wxString& domain) const { - const wxChar *str = GetSingularString(szOrigString, szDomain); - return (str != NULL) ? str : wxLocale::GetString(szOrigString, szDomain); + return GetSingularString(origString, domain); } -const wxChar *wxPyLocale::GetString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetString(const wxString& origString, + const wxString& origString2, + size_t n, + const wxString& domain) const { - const wxChar *str = GetPluralString(szOrigString, szOrigString2, n, szDomain); - return (str != NULL) ? str : wxLocale::GetString(szOrigString, szOrigString2, n, szDomain); + return GetPluralString(origString, origString2, n, domain); } -const wxChar *wxPyLocale::GetSingularString(const wxChar *szOrigString, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetSingularString(const wxString& origString, + const wxString& domain) const { bool found; - static wxString str; - str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string. + wxString str( _T("error in translation")); wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) { - PyObject* param1 = wx2PyString(szOrigString); - PyObject* param2 = wx2PyString(szDomain); + if ((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) { + PyObject* param1 = wx2PyString(origString); + PyObject* param2 = wx2PyString(domain); PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)", param1, param2)); Py_DECREF(param1); Py_DECREF(param2); @@ -3479,22 +3479,24 @@ const wxChar *wxPyLocale::GetSingularString(const wxChar *szOrigString, } } wxPyEndBlockThreads(blocked); - return (found ? (const wxChar*)str.c_str() : NULL); + return (found ? str : wxLocale::GetString(origString, domain)); } -const wxChar *wxPyLocale::GetPluralString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetPluralString(const wxString& origString, + const wxString& origString2, size_t n, + const wxString& domain) const { bool found; - static wxString str; - str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string. + wxString str( _T("error in translation")); wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) { - PyObject* param1 = wx2PyString(szOrigString); - PyObject* param2 = wx2PyString(szOrigString2); - PyObject* param4 = wx2PyString(szDomain); - PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiO)", param1, param2, (int)n, param4)); + if ((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) { + PyObject* param1 = wx2PyString(origString); + PyObject* param2 = wx2PyString(origString2); + PyObject* param4 = wx2PyString(domain); + PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, + Py_BuildValue("(OOiO)", + param1, param2, + (int)n, param4)); Py_DECREF(param1); Py_DECREF(param2); Py_DECREF(param4); @@ -3504,7 +3506,7 @@ const wxChar *wxPyLocale::GetPluralString(const wxChar *szOrigString, } } wxPyEndBlockThreads(blocked); - return (found ? (const wxChar*)str.c_str() : NULL); + return (found ? str : wxLocale::GetString(origString, origString2, n, domain) ); } SWIGINTERN wxPyLocale *new_wxPyLocale(int language=-1,int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING){ @@ -15984,7 +15986,7 @@ SWIGINTERN PyObject *_wrap_Locale_Init1(PyObject *SWIGUNUSEDPARM(self), PyObject PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szName",(char *) "szShort",(char *) "szLocale",(char *) "bLoadDefault",(char *) "bConvertEncoding", NULL + (char *) "self",(char *) "name",(char *) "shortName",(char *) "locale",(char *) "bLoadDefault",(char *) "bConvertEncoding", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Locale_Init1",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; @@ -16386,7 +16388,7 @@ SWIGINTERN PyObject *_wrap_Locale_AddCatalog(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szDomain", NULL + (char *) "self",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_AddCatalog",kwnames,&obj0,&obj1)) SWIG_fail; @@ -16466,7 +16468,7 @@ SWIGINTERN PyObject *_wrap_Locale_IsLoaded(PyObject *SWIGUNUSEDPARM(self), PyObj PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szDomain", NULL + (char *) "self",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_IsLoaded",kwnames,&obj0,&obj1)) SWIG_fail; @@ -16653,7 +16655,7 @@ SWIGINTERN PyObject *_wrap_Locale_GetString(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szOrigString",(char *) "szDomain", NULL + (char *) "self",(char *) "origString",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Locale_GetString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; @@ -16866,20 +16868,19 @@ fail: SWIGINTERN PyObject *_wrap_PyLocale_GetSingularString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyLocale *arg1 = (wxPyLocale *) 0 ; - wxChar *arg2 = (wxChar *) 0 ; - wxChar *arg3 = (wxChar *) NULL ; - wxChar *result = 0 ; + wxString *arg2 = 0 ; + wxString const &arg3_defvalue = wxPyEmptyString ; + wxString *arg3 = (wxString *) &arg3_defvalue ; + wxString *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + bool temp2 = false ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szOrigString",(char *) "szDomain", NULL + (char *) "self",(char *) "origString",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLocale_GetSingularString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; @@ -16888,27 +16889,52 @@ SWIGINTERN PyObject *_wrap_PyLocale_GetSingularString(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyLocale_GetSingularString" "', expected argument " "1"" of type '" "wxPyLocale const *""'"); } arg1 = reinterpret_cast< wxPyLocale * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyLocale_GetSingularString" "', expected argument " "2"" of type '" "wxChar const *""'"); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; } - arg2 = reinterpret_cast< wxChar * >(argp2); if (obj2) { - res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PyLocale_GetSingularString" "', expected argument " "3"" of type '" "wxChar const *""'"); + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; } - arg3 = reinterpret_cast< wxChar * >(argp3); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChar *)((wxPyLocale const *)arg1)->GetSingularString((wxChar const *)arg2,(wxChar const *)arg3); + { + wxString const &_result_ref = ((wxPyLocale const *)arg1)->GetSingularString((wxString const &)*arg2,(wxString const &)*arg3); + result = (wxString *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxChar, 0 | 0 ); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } return NULL; } @@ -16916,28 +16942,26 @@ fail: SWIGINTERN PyObject *_wrap_PyLocale_GetPluralString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyLocale *arg1 = (wxPyLocale *) 0 ; - wxChar *arg2 = (wxChar *) 0 ; - wxChar *arg3 = (wxChar *) 0 ; + wxString *arg2 = 0 ; + wxString *arg3 = 0 ; size_t arg4 ; - wxChar *arg5 = (wxChar *) NULL ; - wxChar *result = 0 ; + wxString const &arg5_defvalue = wxPyEmptyString ; + wxString *arg5 = (wxString *) &arg5_defvalue ; + wxString *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + bool temp2 = false ; + bool temp3 = false ; size_t val4 ; int ecode4 = 0 ; - void *argp5 = 0 ; - int res5 = 0 ; + bool temp5 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szOrigString",(char *) "szOrigString2",(char *) "n",(char *) "szDomain", NULL + (char *) "self",(char *) "origString",(char *) "origString2",(char *) "n",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyLocale_GetPluralString",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; @@ -16946,37 +16970,70 @@ SWIGINTERN PyObject *_wrap_PyLocale_GetPluralString(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyLocale_GetPluralString" "', expected argument " "1"" of type '" "wxPyLocale const *""'"); } arg1 = reinterpret_cast< wxPyLocale * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyLocale_GetPluralString" "', expected argument " "2"" of type '" "wxChar const *""'"); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; } - arg2 = reinterpret_cast< wxChar * >(argp2); - res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PyLocale_GetPluralString" "', expected argument " "3"" of type '" "wxChar const *""'"); + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; } - arg3 = reinterpret_cast< wxChar * >(argp3); ecode4 = SWIG_AsVal_size_t(obj3, &val4); if (!SWIG_IsOK(ecode4)) { SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyLocale_GetPluralString" "', expected argument " "4"" of type '" "size_t""'"); } arg4 = static_cast< size_t >(val4); if (obj4) { - res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "PyLocale_GetPluralString" "', expected argument " "5"" of type '" "wxChar const *""'"); + { + arg5 = wxString_in_helper(obj4); + if (arg5 == NULL) SWIG_fail; + temp5 = true; } - arg5 = reinterpret_cast< wxChar * >(argp5); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChar *)((wxPyLocale const *)arg1)->GetPluralString((wxChar const *)arg2,(wxChar const *)arg3,arg4,(wxChar const *)arg5); + { + wxString const &_result_ref = ((wxPyLocale const *)arg1)->GetPluralString((wxString const &)*arg2,(wxString const &)*arg3,arg4,(wxString const &)*arg5); + result = (wxString *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxChar, 0 | 0 ); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } + { + if (temp5) + delete arg5; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } + { + if (temp5) + delete arg5; + } return NULL; } @@ -39857,7 +39914,6 @@ static swig_type_info _swigt__p_wxBrush = {"_p_wxBrush", "wxBrush *", 0, 0, (voi static swig_type_info _swigt__p_wxBrushList = {"_p_wxBrushList", "wxBrushList *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxBufferedDC = {"_p_wxBufferedDC", "wxBufferedDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxBufferedPaintDC = {"_p_wxBufferedPaintDC", "wxBufferedPaintDC *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxChar = {"_p_wxChar", "wxChar *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxClientDC = {"_p_wxClientDC", "wxClientDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxColourDatabase = {"_p_wxColourDatabase", "wxColourDatabase *", 0, 0, (void*)0, 0}; @@ -40035,7 +40091,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxBufferedDC, &_swigt__p_wxBufferedPaintDC, &_swigt__p_wxCURHandler, - &_swigt__p_wxChar, &_swigt__p_wxChildFocusEvent, &_swigt__p_wxClientDC, &_swigt__p_wxClipboardTextEvent, @@ -40201,7 +40256,6 @@ static swig_cast_info _swigc__p_wxBrush[] = { {&_swigt__p_wxBrush, 0, 0, 0},{0, static swig_cast_info _swigc__p_wxBrushList[] = { {&_swigt__p_wxBrushList, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBufferedDC[] = { {&_swigt__p_wxBufferedDC, 0, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxBufferedDC, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBufferedPaintDC[] = { {&_swigt__p_wxBufferedPaintDC, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxChar[] = { {&_swigt__p_wxChar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxClientDC[] = { {&_swigt__p_wxClientDC, 0, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxClientDC, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxColour[] = { {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxColourDatabase[] = { {&_swigt__p_wxColourDatabase, 0, 0, 0},{0, 0, 0, 0}}; @@ -40379,7 +40433,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxBufferedDC, _swigc__p_wxBufferedPaintDC, _swigc__p_wxCURHandler, - _swigc__p_wxChar, _swigc__p_wxChildFocusEvent, _swigc__p_wxClientDC, _swigc__p_wxClipboardTextEvent, diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index cf25f3fbb5..b47baf4d0e 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -5661,12 +5661,23 @@ class Clipboard(_core.Object): """ UsePrimarySelection(self, bool primary=True) - On platforms supporting it (the X11 based platforms), selects the - so called PRIMARY SELECTION as the clipboard as opposed to the - normal clipboard, if primary is True. + On platforms supporting it (the X11 based platforms), selects the so + called PRIMARY SELECTION as the clipboard as opposed to the normal + clipboard, if primary is True. On other platforms all clipboard + operations fail when using the primary selection. This allows code + supporting the primary selection to be written without ill effects on + the other platforms. """ return _misc_.Clipboard_UsePrimarySelection(*args, **kwargs) + def IsUsingPrimarySelection(*args, **kwargs): + """ + IsUsingPrimarySelection(self) -> bool + + Return true if we're using primary selection + """ + return _misc_.Clipboard_IsUsingPrimarySelection(*args, **kwargs) + def Get(*args, **kwargs): """ Get() -> Clipboard diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index be26a2769d..fc0d3c4ea9 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -35651,6 +35651,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Clipboard_IsUsingPrimarySelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxClipboard *arg1 = (wxClipboard *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxClipboard, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Clipboard_IsUsingPrimarySelection" "', expected argument " "1"" of type '" "wxClipboard const *""'"); + } + arg1 = reinterpret_cast< wxClipboard * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxClipboard const *)arg1)->IsUsingPrimarySelection(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Clipboard_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxClipboard *result = 0 ; @@ -39990,6 +40020,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Clipboard_Clear", (PyCFunction)_wrap_Clipboard_Clear, METH_O, NULL}, { (char *)"Clipboard_Flush", (PyCFunction)_wrap_Clipboard_Flush, METH_O, NULL}, { (char *)"Clipboard_UsePrimarySelection", (PyCFunction) _wrap_Clipboard_UsePrimarySelection, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Clipboard_IsUsingPrimarySelection", (PyCFunction)_wrap_Clipboard_IsUsingPrimarySelection, METH_O, NULL}, { (char *)"Clipboard_Get", (PyCFunction)_wrap_Clipboard_Get, METH_NOARGS, NULL}, { (char *)"Clipboard_swigregister", Clipboard_swigregister, METH_VARARGS, NULL}, { (char *)"Clipboard_swiginit", Clipboard_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 3d04f82f7d..ccf6b92382 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -2373,11 +2373,11 @@ FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR FD_PREVIEW = _windows_.FD_PREVIEW FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE # deprecated names -OPEN = FD_OPEN, -SAVE = FD_SAVE, -OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT, -FILE_MUST_EXIST = FD_FILE_MUST_EXIST, -MULTIPLE = FD_MULTIPLE, +OPEN = FD_OPEN +SAVE = FD_SAVE +OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT +FILE_MUST_EXIST = FD_FILE_MUST_EXIST +MULTIPLE = FD_MULTIPLE CHANGE_DIR = FD_CHANGE_DIR class FileDialog(Dialog): diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 16a5428b5a..2799b1dd20 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -1116,6 +1116,11 @@ def StaticLine_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +ST_NO_AUTORESIZE = _controls_.ST_NO_AUTORESIZE +ST_MARKUP = _controls_.ST_MARKUP +ST_ELLIPSIZE_START = _controls_.ST_ELLIPSIZE_START +ST_ELLIPSIZE_MIDDLE = _controls_.ST_ELLIPSIZE_MIDDLE +ST_ELLIPSIZE_END = _controls_.ST_ELLIPSIZE_END class StaticText(_core.Control): """Proxy of C++ StaticText class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -1148,6 +1153,32 @@ class StaticText(_core.Control): """ return _controls_.StaticText_Wrap(*args, **kwargs) + def IsEllipsized(*args, **kwargs): + """IsEllipsized(self) -> bool""" + return _controls_.StaticText_IsEllipsized(*args, **kwargs) + + def RemoveMarkup(*args, **kwargs): + """ + RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + + RemoveMarkup = staticmethod(RemoveMarkup) + def EscapeMarkup(*args, **kwargs): + """ + EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + + EscapeMarkup = staticmethod(EscapeMarkup) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -1173,6 +1204,26 @@ def PreStaticText(*args, **kwargs): val = _controls_.new_PreStaticText(*args, **kwargs) return val +def StaticText_RemoveMarkup(*args, **kwargs): + """ + StaticText_RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + +def StaticText_EscapeMarkup(*args, **kwargs): + """ + StaticText_EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + def StaticText_GetClassDefaultAttributes(*args, **kwargs): """ StaticText_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 93cbabd1ae..27cd7601ca 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -8350,6 +8350,122 @@ fail: } +SWIGINTERN PyObject *_wrap_StaticText_IsEllipsized(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStaticText *arg1 = (wxStaticText *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStaticText, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StaticText_IsEllipsized" "', expected argument " "1"" of type '" "wxStaticText const *""'"); + } + arg1 = reinterpret_cast< wxStaticText * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxStaticText const *)arg1)->IsEllipsized(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_StaticText_RemoveMarkup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticText_RemoveMarkup",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxStaticText::RemoveMarkup((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_StaticText_EscapeMarkup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticText_EscapeMarkup",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxStaticText::EscapeMarkup((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_StaticText_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -47052,6 +47168,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PreStaticText", (PyCFunction)_wrap_new_PreStaticText, METH_NOARGS, NULL}, { (char *)"StaticText_Create", (PyCFunction) _wrap_StaticText_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_Wrap", (PyCFunction) _wrap_StaticText_Wrap, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"StaticText_IsEllipsized", (PyCFunction)_wrap_StaticText_IsEllipsized, METH_O, NULL}, + { (char *)"StaticText_RemoveMarkup", (PyCFunction) _wrap_StaticText_RemoveMarkup, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"StaticText_EscapeMarkup", (PyCFunction) _wrap_StaticText_EscapeMarkup, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticText_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_swigregister", StaticText_swigregister, METH_VARARGS, NULL}, { (char *)"StaticText_swiginit", StaticText_swiginit, METH_VARARGS, NULL}, @@ -50515,6 +50634,11 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticLineNameStr",StaticLineNameStr_get, StaticLineNameStr_set); + SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE))); + SWIG_Python_SetConstant(d, "ST_MARKUP",SWIG_From_int(static_cast< int >(wxST_MARKUP))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_START",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_START))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_MIDDLE",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_MIDDLE))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_END",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_END))); SWIG_addvarlink(SWIG_globals(),(char*)"ListBoxNameStr",ListBoxNameStr_get, ListBoxNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"TextCtrlNameStr",TextCtrlNameStr_get, TextCtrlNameStr_set); SWIG_Python_SetConstant(d, "TE_NO_VSCROLL",SWIG_From_int(static_cast< int >(wxTE_NO_VSCROLL))); diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index c6b4dfcf25..d57326521b 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -131,9 +131,6 @@ SB_HORIZONTAL = _core_.SB_HORIZONTAL SB_VERTICAL = _core_.SB_VERTICAL RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX ST_SIZEGRIP = _core_.ST_SIZEGRIP -ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE -ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE -ST_DOTS_END = _core_.ST_DOTS_END FLOOD_SURFACE = _core_.FLOOD_SURFACE FLOOD_BORDER = _core_.FLOOD_BORDER ODDEVEN_RULE = _core_.ODDEVEN_RULE @@ -11393,6 +11390,15 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) + def RemoveMnemonics(*args, **kwargs): + """ + RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + + RemoveMnemonics = staticmethod(RemoveMnemonics) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11425,6 +11431,14 @@ def PreControl(*args, **kwargs): val = _core_.new_PreControl(*args, **kwargs) return val +def Control_RemoveMnemonics(*args, **kwargs): + """ + Control_RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + def Control_GetClassDefaultAttributes(*args, **kwargs): """ Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -12080,14 +12094,6 @@ class SizerItem(Object): """ return _core_.SizerItem_GetWindow(*args, **kwargs) - def SetWindow(*args, **kwargs): - """ - SetWindow(self, Window window) - - Set the window to be managed by this sizer item. - """ - return _core_.SizerItem_SetWindow(*args, **kwargs) - def GetSizer(*args, **kwargs): """ GetSizer(self) -> Sizer @@ -12096,6 +12102,22 @@ class SizerItem(Object): """ return _core_.SizerItem_GetSizer(*args, **kwargs) + def GetSpacer(*args, **kwargs): + """ + GetSpacer(self) -> Size + + Get the size of the spacer managed by this sizer item. + """ + return _core_.SizerItem_GetSpacer(*args, **kwargs) + + def SetWindow(*args, **kwargs): + """ + SetWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_SetWindow(*args, **kwargs) + def SetSizer(*args, **kwargs): """ SetSizer(self, Sizer sizer) @@ -12104,21 +12126,41 @@ class SizerItem(Object): """ return _core_.SizerItem_SetSizer(*args, **kwargs) - def GetSpacer(*args, **kwargs): + def SetSpacer(*args, **kwargs): """ - GetSpacer(self) -> Size + SetSpacer(self, Size size) - Get the size of the spacer managed by this sizer item. + Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_GetSpacer(*args, **kwargs) + return _core_.SizerItem_SetSpacer(*args, **kwargs) - def SetSpacer(*args, **kwargs): + SetWindow = wx._deprecated(SetWindow, "Use `AssignWindow` instead.") + SetSizer = wx._deprecated(SetSizer, "Use `AssignSizer` instead.") + SetSpacer = wx._deprecated(SetSpacer, "Use `AssignSpacer` instead.") + + def AssignWindow(*args, **kwargs): """ - SetSpacer(self, Size size) + AssignWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_AssignWindow(*args, **kwargs) + + def AssignSizer(*args, **kwargs): + """ + AssignSizer(self, Sizer sizer) + + Set the subsizer to be managed by this sizer item. + """ + return _core_.SizerItem_AssignSizer(*args, **kwargs) + + def AssignSpacer(*args, **kwargs): + """ + AssignSpacer(self, Size size) Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_SetSpacer(*args, **kwargs) + return _core_.SizerItem_AssignSpacer(*args, **kwargs) def Show(*args, **kwargs): """ @@ -12172,10 +12214,10 @@ class SizerItem(Object): Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") Rect = property(GetRect,doc="See `GetRect`") Size = property(GetSize,doc="See `GetSize`") - Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") - Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + Sizer = property(GetSizer,AssignSizer,doc="See `GetSizer` and `AssignSizer`") + Spacer = property(GetSpacer,AssignSpacer,doc="See `GetSpacer` and `AssignSpacer`") UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") - Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") + Window = property(GetWindow,AssignWindow,doc="See `GetWindow` and `AssignWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 4faa7e06c5..999e320980 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -47948,6 +47948,49 @@ fail: } +SWIGINTERN PyObject *_wrap_Control_RemoveMnemonics(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Control_RemoveMnemonics",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxControl::RemoveMnemonics((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -50499,6 +50542,64 @@ fail: } +SWIGINTERN PyObject *_wrap_SizerItem_GetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSizer *result = 0 ; + 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_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizer *)(arg1)->GetSizer(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerItem_GetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSize 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_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetSpacer(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_SizerItem_SetWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; @@ -50537,62 +50638,106 @@ fail: } -SWIGINTERN PyObject *_wrap_SizerItem_GetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SizerItem_SetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSizer *result = 0 ; + wxSizer *arg2 = (wxSizer *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "sizer", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); + res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxSizer, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_SetSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSizer *)(arg1)->GetSizer(); + (arg1)->SetSizer(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSize *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); { - resultobj = wxPyMake_wxObject(result, (bool)0); + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSpacer((wxSize const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_SizerItem_SetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSizer *arg2 = (wxSizer *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; int res2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "sizer", NULL + (char *) "self",(char *) "window", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignWindow",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignWindow" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); - res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxSizer, SWIG_POINTER_DISOWN | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_SetSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_AssignWindow" "', expected argument " "2"" of type '" "wxWindow *""'"); } + arg2 = reinterpret_cast< wxWindow * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSizer(arg2); + (arg1)->AssignWindow(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -50603,35 +50748,45 @@ fail: } -SWIGINTERN PyObject *_wrap_SizerItem_GetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSize result; + wxSizer *arg2 = (wxSizer *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "sizer", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignSizer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_AssignSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + } + arg2 = reinterpret_cast< wxSizer * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetSpacer(); + (arg1)->AssignSizer(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; wxSize *arg2 = 0 ; @@ -50644,10 +50799,10 @@ SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), P (char *) "self",(char *) "size", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignSpacer",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); { @@ -50656,7 +50811,7 @@ SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSpacer((wxSize const &)*arg2); + (arg1)->AssignSpacer((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -59013,6 +59168,7 @@ 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_RemoveMnemonics", (PyCFunction) _wrap_Control_RemoveMnemonics, METH_VARARGS | METH_KEYWORDS, 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}, @@ -59088,11 +59244,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"SizerItem_SetBorder", (PyCFunction) _wrap_SizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetBorder", (PyCFunction)_wrap_SizerItem_GetBorder, METH_O, NULL}, { (char *)"SizerItem_GetWindow", (PyCFunction)_wrap_SizerItem_GetWindow, METH_O, NULL}, - { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetSizer", (PyCFunction)_wrap_SizerItem_GetSizer, METH_O, NULL}, - { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetSpacer", (PyCFunction)_wrap_SizerItem_GetSpacer, METH_O, NULL}, + { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_SetSpacer", (PyCFunction) _wrap_SizerItem_SetSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignWindow", (PyCFunction) _wrap_SizerItem_AssignWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignSizer", (PyCFunction) _wrap_SizerItem_AssignSizer, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignSpacer", (PyCFunction) _wrap_SizerItem_AssignSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_Show", (PyCFunction) _wrap_SizerItem_Show, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_IsShown", (PyCFunction)_wrap_SizerItem_IsShown, METH_O, NULL}, { (char *)"SizerItem_GetPosition", (PyCFunction)_wrap_SizerItem_GetPosition, METH_O, NULL}, @@ -60947,9 +61106,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "SB_VERTICAL",SWIG_From_int(static_cast< int >(wxSB_VERTICAL))); SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX))); SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP))); - SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE))); - SWIG_Python_SetConstant(d, "ST_DOTS_MIDDLE",SWIG_From_int(static_cast< int >(wxST_DOTS_MIDDLE))); - SWIG_Python_SetConstant(d, "ST_DOTS_END",SWIG_From_int(static_cast< int >(wxST_DOTS_END))); SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE))); SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER))); SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE))); diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index b4494a0615..f45e23f3c4 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -5669,12 +5669,23 @@ class Clipboard(_core.Object): """ UsePrimarySelection(self, bool primary=True) - On platforms supporting it (the X11 based platforms), selects the - so called PRIMARY SELECTION as the clipboard as opposed to the - normal clipboard, if primary is True. + On platforms supporting it (the X11 based platforms), selects the so + called PRIMARY SELECTION as the clipboard as opposed to the normal + clipboard, if primary is True. On other platforms all clipboard + operations fail when using the primary selection. This allows code + supporting the primary selection to be written without ill effects on + the other platforms. """ return _misc_.Clipboard_UsePrimarySelection(*args, **kwargs) + def IsUsingPrimarySelection(*args, **kwargs): + """ + IsUsingPrimarySelection(self) -> bool + + Return true if we're using primary selection + """ + return _misc_.Clipboard_IsUsingPrimarySelection(*args, **kwargs) + def Get(*args, **kwargs): """ Get() -> Clipboard diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index a4a6c9bc9f..94d6cf5d85 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -35712,6 +35712,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Clipboard_IsUsingPrimarySelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxClipboard *arg1 = (wxClipboard *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxClipboard, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Clipboard_IsUsingPrimarySelection" "', expected argument " "1"" of type '" "wxClipboard const *""'"); + } + arg1 = reinterpret_cast< wxClipboard * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxClipboard const *)arg1)->IsUsingPrimarySelection(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Clipboard_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxClipboard *result = 0 ; @@ -40053,6 +40083,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Clipboard_Clear", (PyCFunction)_wrap_Clipboard_Clear, METH_O, NULL}, { (char *)"Clipboard_Flush", (PyCFunction)_wrap_Clipboard_Flush, METH_O, NULL}, { (char *)"Clipboard_UsePrimarySelection", (PyCFunction) _wrap_Clipboard_UsePrimarySelection, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Clipboard_IsUsingPrimarySelection", (PyCFunction)_wrap_Clipboard_IsUsingPrimarySelection, METH_O, NULL}, { (char *)"Clipboard_Get", (PyCFunction)_wrap_Clipboard_Get, METH_NOARGS, NULL}, { (char *)"Clipboard_swigregister", Clipboard_swigregister, METH_VARARGS, NULL}, { (char *)"Clipboard_swiginit", Clipboard_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 2f21fc208b..6a7ee037dd 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -2353,11 +2353,11 @@ FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR FD_PREVIEW = _windows_.FD_PREVIEW FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE # deprecated names -OPEN = FD_OPEN, -SAVE = FD_SAVE, -OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT, -FILE_MUST_EXIST = FD_FILE_MUST_EXIST, -MULTIPLE = FD_MULTIPLE, +OPEN = FD_OPEN +SAVE = FD_SAVE +OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT +FILE_MUST_EXIST = FD_FILE_MUST_EXIST +MULTIPLE = FD_MULTIPLE CHANGE_DIR = FD_CHANGE_DIR class FileDialog(Dialog): diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index d257bdaefb..9506c5639d 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -1122,6 +1122,11 @@ def StaticLine_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +ST_NO_AUTORESIZE = _controls_.ST_NO_AUTORESIZE +ST_MARKUP = _controls_.ST_MARKUP +ST_ELLIPSIZE_START = _controls_.ST_ELLIPSIZE_START +ST_ELLIPSIZE_MIDDLE = _controls_.ST_ELLIPSIZE_MIDDLE +ST_ELLIPSIZE_END = _controls_.ST_ELLIPSIZE_END class StaticText(_core.Control): """Proxy of C++ StaticText class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -1154,6 +1159,32 @@ class StaticText(_core.Control): """ return _controls_.StaticText_Wrap(*args, **kwargs) + def IsEllipsized(*args, **kwargs): + """IsEllipsized(self) -> bool""" + return _controls_.StaticText_IsEllipsized(*args, **kwargs) + + def RemoveMarkup(*args, **kwargs): + """ + RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + + RemoveMarkup = staticmethod(RemoveMarkup) + def EscapeMarkup(*args, **kwargs): + """ + EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + + EscapeMarkup = staticmethod(EscapeMarkup) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -1179,6 +1210,26 @@ def PreStaticText(*args, **kwargs): val = _controls_.new_PreStaticText(*args, **kwargs) return val +def StaticText_RemoveMarkup(*args, **kwargs): + """ + StaticText_RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + +def StaticText_EscapeMarkup(*args, **kwargs): + """ + StaticText_EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + def StaticText_GetClassDefaultAttributes(*args, **kwargs): """ StaticText_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 82cdc2ef87..da5af3d1b6 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -8395,6 +8395,122 @@ fail: } +SWIGINTERN PyObject *_wrap_StaticText_IsEllipsized(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStaticText *arg1 = (wxStaticText *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStaticText, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StaticText_IsEllipsized" "', expected argument " "1"" of type '" "wxStaticText const *""'"); + } + arg1 = reinterpret_cast< wxStaticText * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxStaticText const *)arg1)->IsEllipsized(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_StaticText_RemoveMarkup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticText_RemoveMarkup",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxStaticText::RemoveMarkup((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_StaticText_EscapeMarkup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StaticText_EscapeMarkup",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxStaticText::EscapeMarkup((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_StaticText_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -47338,6 +47454,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PreStaticText", (PyCFunction)_wrap_new_PreStaticText, METH_NOARGS, NULL}, { (char *)"StaticText_Create", (PyCFunction) _wrap_StaticText_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_Wrap", (PyCFunction) _wrap_StaticText_Wrap, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"StaticText_IsEllipsized", (PyCFunction)_wrap_StaticText_IsEllipsized, METH_O, NULL}, + { (char *)"StaticText_RemoveMarkup", (PyCFunction) _wrap_StaticText_RemoveMarkup, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"StaticText_EscapeMarkup", (PyCFunction) _wrap_StaticText_EscapeMarkup, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticText_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StaticText_swigregister", StaticText_swigregister, METH_VARARGS, NULL}, { (char *)"StaticText_swiginit", StaticText_swiginit, METH_VARARGS, NULL}, @@ -50813,6 +50932,11 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticLineNameStr",StaticLineNameStr_get, StaticLineNameStr_set); + SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE))); + SWIG_Python_SetConstant(d, "ST_MARKUP",SWIG_From_int(static_cast< int >(wxST_MARKUP))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_START",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_START))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_MIDDLE",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_MIDDLE))); + SWIG_Python_SetConstant(d, "ST_ELLIPSIZE_END",SWIG_From_int(static_cast< int >(wxST_ELLIPSIZE_END))); SWIG_addvarlink(SWIG_globals(),(char*)"ListBoxNameStr",ListBoxNameStr_get, ListBoxNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"TextCtrlNameStr",TextCtrlNameStr_get, TextCtrlNameStr_set); SWIG_Python_SetConstant(d, "TE_NO_VSCROLL",SWIG_From_int(static_cast< int >(wxTE_NO_VSCROLL))); diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 4355426b88..9b70b934b5 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -131,9 +131,6 @@ SB_HORIZONTAL = _core_.SB_HORIZONTAL SB_VERTICAL = _core_.SB_VERTICAL RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX ST_SIZEGRIP = _core_.ST_SIZEGRIP -ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE -ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE -ST_DOTS_END = _core_.ST_DOTS_END FLOOD_SURFACE = _core_.FLOOD_SURFACE FLOOD_BORDER = _core_.FLOOD_BORDER ODDEVEN_RULE = _core_.ODDEVEN_RULE @@ -11397,6 +11394,15 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) + def RemoveMnemonics(*args, **kwargs): + """ + RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + + RemoveMnemonics = staticmethod(RemoveMnemonics) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11429,6 +11435,14 @@ def PreControl(*args, **kwargs): val = _core_.new_PreControl(*args, **kwargs) return val +def Control_RemoveMnemonics(*args, **kwargs): + """ + Control_RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + def Control_GetClassDefaultAttributes(*args, **kwargs): """ Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -12084,14 +12098,6 @@ class SizerItem(Object): """ return _core_.SizerItem_GetWindow(*args, **kwargs) - def SetWindow(*args, **kwargs): - """ - SetWindow(self, Window window) - - Set the window to be managed by this sizer item. - """ - return _core_.SizerItem_SetWindow(*args, **kwargs) - def GetSizer(*args, **kwargs): """ GetSizer(self) -> Sizer @@ -12100,6 +12106,22 @@ class SizerItem(Object): """ return _core_.SizerItem_GetSizer(*args, **kwargs) + def GetSpacer(*args, **kwargs): + """ + GetSpacer(self) -> Size + + Get the size of the spacer managed by this sizer item. + """ + return _core_.SizerItem_GetSpacer(*args, **kwargs) + + def SetWindow(*args, **kwargs): + """ + SetWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_SetWindow(*args, **kwargs) + def SetSizer(*args, **kwargs): """ SetSizer(self, Sizer sizer) @@ -12108,21 +12130,41 @@ class SizerItem(Object): """ return _core_.SizerItem_SetSizer(*args, **kwargs) - def GetSpacer(*args, **kwargs): + def SetSpacer(*args, **kwargs): """ - GetSpacer(self) -> Size + SetSpacer(self, Size size) - Get the size of the spacer managed by this sizer item. + Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_GetSpacer(*args, **kwargs) + return _core_.SizerItem_SetSpacer(*args, **kwargs) - def SetSpacer(*args, **kwargs): + SetWindow = wx._deprecated(SetWindow, "Use `AssignWindow` instead.") + SetSizer = wx._deprecated(SetSizer, "Use `AssignSizer` instead.") + SetSpacer = wx._deprecated(SetSpacer, "Use `AssignSpacer` instead.") + + def AssignWindow(*args, **kwargs): """ - SetSpacer(self, Size size) + AssignWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_AssignWindow(*args, **kwargs) + + def AssignSizer(*args, **kwargs): + """ + AssignSizer(self, Sizer sizer) + + Set the subsizer to be managed by this sizer item. + """ + return _core_.SizerItem_AssignSizer(*args, **kwargs) + + def AssignSpacer(*args, **kwargs): + """ + AssignSpacer(self, Size size) Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_SetSpacer(*args, **kwargs) + return _core_.SizerItem_AssignSpacer(*args, **kwargs) def Show(*args, **kwargs): """ @@ -12176,10 +12218,10 @@ class SizerItem(Object): Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") Rect = property(GetRect,doc="See `GetRect`") Size = property(GetSize,doc="See `GetSize`") - Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") - Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + Sizer = property(GetSizer,AssignSizer,doc="See `GetSizer` and `AssignSizer`") + Spacer = property(GetSpacer,AssignSpacer,doc="See `GetSpacer` and `AssignSpacer`") UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") - Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") + Window = property(GetWindow,AssignWindow,doc="See `GetWindow` and `AssignWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 0772ab4928..0bea93b76f 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -47974,6 +47974,49 @@ fail: } +SWIGINTERN PyObject *_wrap_Control_RemoveMnemonics(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxString *arg1 = 0 ; + wxString result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "str", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Control_RemoveMnemonics",kwnames,&obj0)) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxControl::RemoveMnemonics((wxString const &)*arg1); + 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 + } + { + if (temp1) + delete arg1; + } + return resultobj; +fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ; @@ -50525,6 +50568,64 @@ fail: } +SWIGINTERN PyObject *_wrap_SizerItem_GetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSizer *result = 0 ; + 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_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizer *)(arg1)->GetSizer(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerItem_GetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSize 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_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetSpacer(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_SizerItem_SetWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; @@ -50563,62 +50664,106 @@ fail: } -SWIGINTERN PyObject *_wrap_SizerItem_GetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SizerItem_SetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSizer *result = 0 ; + wxSizer *arg2 = (wxSizer *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "sizer", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); + res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxSizer, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_SetSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSizer *)(arg1)->GetSizer(); + (arg1)->SetSizer(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + wxSize *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + } + arg1 = reinterpret_cast< wxSizerItem * >(argp1); { - resultobj = wxPyMake_wxObject(result, (bool)0); + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSpacer((wxSize const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_SizerItem_SetSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSizer *arg2 = (wxSizer *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; int res2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "sizer", NULL + (char *) "self",(char *) "window", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignWindow",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignWindow" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); - res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxSizer, SWIG_POINTER_DISOWN | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_SetSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_AssignWindow" "', expected argument " "2"" of type '" "wxWindow *""'"); } + arg2 = reinterpret_cast< wxWindow * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSizer(arg2); + (arg1)->AssignWindow(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -50629,35 +50774,45 @@ fail: } -SWIGINTERN PyObject *_wrap_SizerItem_GetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSize result; + wxSizer *arg2 = (wxSizer *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "sizer", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignSizer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_GetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignSizer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SizerItem_AssignSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); + } + arg2 = reinterpret_cast< wxSizer * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetSpacer(); + (arg1)->AssignSizer(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_SizerItem_AssignSpacer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizerItem *arg1 = (wxSizerItem *) 0 ; wxSize *arg2 = 0 ; @@ -50670,10 +50825,10 @@ SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), P (char *) "self",(char *) "size", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSpacer",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_AssignSpacer",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerItem, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_SetSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerItem_AssignSpacer" "', expected argument " "1"" of type '" "wxSizerItem *""'"); } arg1 = reinterpret_cast< wxSizerItem * >(argp1); { @@ -50682,7 +50837,7 @@ SWIGINTERN PyObject *_wrap_SizerItem_SetSpacer(PyObject *SWIGUNUSEDPARM(self), P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSpacer((wxSize const &)*arg2); + (arg1)->AssignSpacer((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -59040,6 +59195,7 @@ 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_RemoveMnemonics", (PyCFunction) _wrap_Control_RemoveMnemonics, METH_VARARGS | METH_KEYWORDS, 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}, @@ -59115,11 +59271,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"SizerItem_SetBorder", (PyCFunction) _wrap_SizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetBorder", (PyCFunction)_wrap_SizerItem_GetBorder, METH_O, NULL}, { (char *)"SizerItem_GetWindow", (PyCFunction)_wrap_SizerItem_GetWindow, METH_O, NULL}, - { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetSizer", (PyCFunction)_wrap_SizerItem_GetSizer, METH_O, NULL}, - { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_GetSpacer", (PyCFunction)_wrap_SizerItem_GetSpacer, METH_O, NULL}, + { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_SetSpacer", (PyCFunction) _wrap_SizerItem_SetSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignWindow", (PyCFunction) _wrap_SizerItem_AssignWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignSizer", (PyCFunction) _wrap_SizerItem_AssignSizer, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerItem_AssignSpacer", (PyCFunction) _wrap_SizerItem_AssignSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_Show", (PyCFunction) _wrap_SizerItem_Show, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_IsShown", (PyCFunction)_wrap_SizerItem_IsShown, METH_O, NULL}, { (char *)"SizerItem_GetPosition", (PyCFunction)_wrap_SizerItem_GetPosition, METH_O, NULL}, @@ -60974,9 +61133,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "SB_VERTICAL",SWIG_From_int(static_cast< int >(wxSB_VERTICAL))); SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX))); SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP))); - SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE))); - SWIG_Python_SetConstant(d, "ST_DOTS_MIDDLE",SWIG_From_int(static_cast< int >(wxST_DOTS_MIDDLE))); - SWIG_Python_SetConstant(d, "ST_DOTS_END",SWIG_From_int(static_cast< int >(wxST_DOTS_END))); SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE))); SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER))); SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE))); diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index b4494a0615..f45e23f3c4 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -5669,12 +5669,23 @@ class Clipboard(_core.Object): """ UsePrimarySelection(self, bool primary=True) - On platforms supporting it (the X11 based platforms), selects the - so called PRIMARY SELECTION as the clipboard as opposed to the - normal clipboard, if primary is True. + On platforms supporting it (the X11 based platforms), selects the so + called PRIMARY SELECTION as the clipboard as opposed to the normal + clipboard, if primary is True. On other platforms all clipboard + operations fail when using the primary selection. This allows code + supporting the primary selection to be written without ill effects on + the other platforms. """ return _misc_.Clipboard_UsePrimarySelection(*args, **kwargs) + def IsUsingPrimarySelection(*args, **kwargs): + """ + IsUsingPrimarySelection(self) -> bool + + Return true if we're using primary selection + """ + return _misc_.Clipboard_IsUsingPrimarySelection(*args, **kwargs) + def Get(*args, **kwargs): """ Get() -> Clipboard diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index f76433047e..56dbd55ba3 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -35712,6 +35712,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Clipboard_IsUsingPrimarySelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxClipboard *arg1 = (wxClipboard *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxClipboard, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Clipboard_IsUsingPrimarySelection" "', expected argument " "1"" of type '" "wxClipboard const *""'"); + } + arg1 = reinterpret_cast< wxClipboard * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxClipboard const *)arg1)->IsUsingPrimarySelection(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Clipboard_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxClipboard *result = 0 ; @@ -40053,6 +40083,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Clipboard_Clear", (PyCFunction)_wrap_Clipboard_Clear, METH_O, NULL}, { (char *)"Clipboard_Flush", (PyCFunction)_wrap_Clipboard_Flush, METH_O, NULL}, { (char *)"Clipboard_UsePrimarySelection", (PyCFunction) _wrap_Clipboard_UsePrimarySelection, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Clipboard_IsUsingPrimarySelection", (PyCFunction)_wrap_Clipboard_IsUsingPrimarySelection, METH_O, NULL}, { (char *)"Clipboard_Get", (PyCFunction)_wrap_Clipboard_Get, METH_NOARGS, NULL}, { (char *)"Clipboard_swigregister", Clipboard_swigregister, METH_VARARGS, NULL}, { (char *)"Clipboard_swiginit", Clipboard_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 3f6b371091..87a28b1e9e 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -2381,11 +2381,11 @@ FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR FD_PREVIEW = _windows_.FD_PREVIEW FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE # deprecated names -OPEN = FD_OPEN, -SAVE = FD_SAVE, -OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT, -FILE_MUST_EXIST = FD_FILE_MUST_EXIST, -MULTIPLE = FD_MULTIPLE, +OPEN = FD_OPEN +SAVE = FD_SAVE +OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT +FILE_MUST_EXIST = FD_FILE_MUST_EXIST +MULTIPLE = FD_MULTIPLE CHANGE_DIR = FD_CHANGE_DIR class FileDialog(Dialog): -- 2.45.2