From: Václav Slavík Date: Wed, 30 Jun 2004 17:12:03 +0000 (+0000) Subject: SetDefaultXXX -> SetOwnXXX X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fa47d7a7ad7f37b0a3304e10a440ed791c387933 SetDefaultXXX -> SetOwnXXX git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex index e69f493024..9cf6cadb0c 100644 --- a/docs/latex/wx/window.tex +++ b/docs/latex/wx/window.tex @@ -1295,7 +1295,7 @@ By ``intelligently'' the following is meant: by default, all windows use their own \helpref{default}{wxwindowgetclassdefaultattributes} attributes. However if some of the parents attributes are explicitly (that is, using \helpref{SetFont}{wxwindowsetfont} and not -\helpref{SetDefaultFont}{wxwindowsetdefaultfont}) changed \emph{and} if the +\helpref{SetOwnFont}{wxwindowsetownfont}) changed \emph{and} if the corresponding attribute hadn't been explicitly set for this window itself, then this window takes the same value as used by the parent. In addition, if the window overrides \helpref{ShouldInheritColours}{wxwindowshouldinheritcolours} @@ -2371,7 +2371,7 @@ Sets the background colour of the window. Please see \helpref{InheritAttributes}{wxwindowinheritattributes} for explanation of the difference between this method and -\helpref{SetDefaultBackgroundColour}{wxwindowsetdefaultbackgroundcolour}. +\helpref{SetOwnBackgroundColour}{wxwindowsetownbackgroundcolour}. \wxheading{Parameters} @@ -2510,9 +2510,9 @@ explicitly. When setting both a wxLayoutConstraints and a \helpref{wxSizer}{wxsi sizer will have effect. -\membersection{wxWindow::SetDefaultBackgroundColour}\label{wxwindowsetdefaultbackgroundcolour} +\membersection{wxWindow::SetOwnBackgroundColour}\label{wxwindowsetownbackgroundcolour} -\func{void}{SetDefaultBackgroundColour}{\param{const wxColour\& }{colour}} +\func{void}{SetOwnBackgroundColour}{\param{const wxColour\& }{colour}} Sets the background colour of the window but prevents it from being inherited by the children of this window. @@ -2523,9 +2523,9 @@ by the children of this window. \helpref{InheritAttributes}{wxwindowinheritattributes} -\membersection{wxWindow::SetDefaultFont}\label{wxwindowsetdefaultfont} +\membersection{wxWindow::SetOwnFont}\label{wxwindowsetownfont} -\func{void}{SetDefaultBackgroundColour}{\param{const wxColour\& }{colour}} +\func{void}{SetOwnBackgroundColour}{\param{const wxColour\& }{colour}} Sets the font of the window but prevents it from being inherited by the children of this window. @@ -2536,9 +2536,9 @@ children of this window. \helpref{InheritAttributes}{wxwindowinheritattributes} -\membersection{wxWindow::SetDefaultForegroundColour}\label{wxwindowsetdefaultforegroundcolour} +\membersection{wxWindow::SetOwnForegroundColour}\label{wxwindowsetownforegroundcolour} -\func{void}{SetDefaultForegroundColour}{\param{const wxColour\& }{colour}} +\func{void}{SetOwnForegroundColour}{\param{const wxColour\& }{colour}} Sets the foreground colour of the window but prevents it from being inherited by the children of this window. @@ -2659,7 +2659,7 @@ can be overridden to do something in addition to this in the derived classes. Sets the font for this window. This function should not be called for the parent window if you don't want its font to be inherited by its children, -use \helpref{SetDefaultFont}{wxwindowsetdefaultfont} instead in this case and +use \helpref{SetOwnFont}{wxwindowsetownfont} instead in this case and see \helpref{InheritAttributes}{wxwindowinheritattributes} for more explanations. @@ -2682,7 +2682,7 @@ Sets the foreground colour of the window. Please see \helpref{InheritAttributes}{wxwindowinheritattributes} for explanation of the difference between this method and -\helpref{SetDefaultForegroundColour}{wxwindowsetdefaultforegroundcolour}. +\helpref{SetOwnForegroundColour}{wxwindowsetownforegroundcolour}. \wxheading{Parameters} diff --git a/include/wx/window.h b/include/wx/window.h index 1c67cddef1..dec9b3fe58 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -728,7 +728,7 @@ public: // SetDefaultXXX() reset the "m_inheritXXX" flag after setting the // value to prevent it from being inherited by our children virtual bool SetBackgroundColour(const wxColour& colour); - void SetDefaultBackgroundColour(const wxColour& colour) + void SetOwnBackgroundColour(const wxColour& colour) { if ( SetBackgroundColour(colour) ) m_inheritBgCol = false; @@ -736,7 +736,7 @@ public: wxColour GetBackgroundColour() const; virtual bool SetForegroundColour(const wxColour& colour); - void SetDefaultForegroundColour(const wxColour& colour) + void SetOwnForegroundColour(const wxColour& colour) { if ( SetForegroundColour(colour) ) m_inheritFgCol = false; @@ -746,7 +746,7 @@ public: // set/retrieve the font for the window (SetFont() returns true if the // font really changed) virtual bool SetFont(const wxFont& font) = 0; - void SetDefaultFont(const wxFont& font) + void SetOwnFont(const wxFont& font) { if ( SetFont(font) ) m_inheritFont = false; diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index ea0184e2d0..f38e12eb13 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -3990,15 +3990,15 @@ void wxGrid::Create() wxColour lfg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); wxColour lbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ); #endif - m_cornerLabelWin->SetDefaultForegroundColour(lfg); - m_cornerLabelWin->SetDefaultBackgroundColour(lbg); - m_rowLabelWin->SetDefaultForegroundColour(lfg); - m_rowLabelWin->SetDefaultBackgroundColour(lbg); - m_colLabelWin->SetDefaultForegroundColour(lfg); - m_colLabelWin->SetDefaultBackgroundColour(lbg); - - m_gridWin->SetDefaultForegroundColour(gfg); - m_gridWin->SetDefaultBackgroundColour(gbg); + m_cornerLabelWin->SetOwnForegroundColour(lfg); + m_cornerLabelWin->SetOwnBackgroundColour(lbg); + m_rowLabelWin->SetOwnForegroundColour(lfg); + m_rowLabelWin->SetOwnBackgroundColour(lbg); + m_colLabelWin->SetOwnForegroundColour(lfg); + m_colLabelWin->SetOwnBackgroundColour(lbg); + + m_gridWin->SetOwnForegroundColour(gfg); + m_gridWin->SetOwnBackgroundColour(gbg); Init(); } diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 0b552205c6..c561337dae 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -1666,13 +1666,13 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, #if _USE_VISATTR wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); - SetDefaultForegroundColour( attr.colFg ); - SetDefaultBackgroundColour( attr.colBg ); - SetDefaultFont( attr.font ); + SetOwnForegroundColour( attr.colFg ); + SetOwnBackgroundColour( attr.colBg ); + SetOwnFont( attr.font ); #else - SetDefaultForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); - SetDefaultBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); - SetDefaultFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT )); + SetOwnForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + SetOwnBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); + SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT )); #endif } @@ -2212,9 +2212,9 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, SetScrollbars( 0, 0, 0, 0, 0, 0 ); wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes(); - SetDefaultForegroundColour( attr.colFg ); - SetDefaultBackgroundColour( attr.colBg ); - SetDefaultFont( attr.font ); + SetOwnForegroundColour( attr.colFg ); + SetOwnBackgroundColour( attr.colBg ); + SetOwnFont( attr.font ); } wxListMainWindow::~wxListMainWindow() diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 82cd049b80..4ca9560a5e 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -791,9 +791,9 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent, #endif wxVisualAttributes attr = GetDefaultAttributes(); - SetDefaultForegroundColour( attr.colFg ); - SetDefaultBackgroundColour( attr.colBg ); - SetDefaultFont(attr.font); + SetOwnForegroundColour( attr.colFg ); + SetOwnBackgroundColour( attr.colBg ); + SetOwnFont(attr.font); // m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86 m_dottedPen = wxPen( wxT("grey"), 0, 0 ); diff --git a/wxPython/docs/xml/wxPython-metadata.xml b/wxPython/docs/xml/wxPython-metadata.xml index 9d64a3d2ca..d8b1da291e 100644 --- a/wxPython/docs/xml/wxPython-metadata.xml +++ b/wxPython/docs/xml/wxPython-metadata.xml @@ -4832,8 +4832,8 @@ modules. - - SetDefaultBackgroundColour(self, Colour colour) + + SetOwnBackroundColour(self, Colour colour) @@ -4848,8 +4848,8 @@ not be used at all. - - SetDefaultForegroundColour(self, Colour colour) + + SetOwnForegroundColour(self, Colour colour) @@ -4886,8 +4886,8 @@ be reset back to default. - - SetDefaultFont(self, Font font) + + SetOwnFont(self, Font font) @@ -5284,7 +5284,7 @@ colours. By 'intelligently' the following is meant: by default, all windows use their own default attributes. However if some of the parent's attributes are explicitly changed (that is, using SetFont and not -SetDefaultFont) and if the corresponding attribute hadn't been +SetOwnFont) and if the corresponding attribute hadn't been explicitly set for this window itself, then this window takes the same value as used by the parent. In addition, if the window overrides ShouldInheritColours to return false, the colours will not be changed diff --git a/wxPython/misc/widgetLayoutTest.py b/wxPython/misc/widgetLayoutTest.py index 3bc942752a..968a6f6044 100644 --- a/wxPython/misc/widgetLayoutTest.py +++ b/wxPython/misc/widgetLayoutTest.py @@ -50,10 +50,10 @@ class LayoutTestFrame(wx.Frame): bottomPanel = wx.Panel(p, style=wx.SUNKEN_BORDER, name="bottomPanel") bottomPanel.SetMinSize((640,240)) - bottomPanel.SetDefaultBackgroundColour("light blue") + bottomPanel.SetOwnBackroundColour("light blue") self.testPanel = wx.Panel(bottomPanel, name="testPanel") - self.testPanel.SetDefaultBackgroundColour((205, 183, 181)) # mistyrose3 + self.testPanel.SetOwnBackroundColour((205, 183, 181)) # mistyrose3 self.testWidget = None self.infoPane = InfoPane(p) diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i index 47c67a979a..34285e9f46 100644 --- a/wxPython/src/_window.i +++ b/wxPython/src/_window.i @@ -1302,7 +1302,7 @@ themes represent the appearance chosen by the user to be used for all applications on the system.", ""); DocDeclStr( - void , SetDefaultBackgroundColour(const wxColour& colour), + void , SetOwnBackroundColour(const wxColour& colour), "", ""); @@ -1315,7 +1315,7 @@ the window class; it may be the text colour or other colour, or it may not be used at all.", ""); DocDeclStr( - void , SetDefaultForegroundColour(const wxColour& colour), + void , SetOwnForegroundColour(const wxColour& colour), "", ""); @@ -1352,7 +1352,7 @@ be reset back to default.", ""); "Sets the font for this window.", ""); DocDeclStr( - void , SetDefaultFont(const wxFont& font), + void , SetOwnFont(const wxFont& font), "", ""); @@ -1810,7 +1810,7 @@ colours. By 'intelligently' the following is meant: by default, all windows use their own default attributes. However if some of the parent's attributes are explicitly changed (that is, using SetFont and not -SetDefaultFont) and if the corresponding attribute hadn't been +SetOwnFont) and if the corresponding attribute hadn't been explicitly set for this window itself, then this window takes the same value as used by the parent. In addition, if the window overrides ShouldInheritColours to return false, the colours will not be changed diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 22e9ea9051..4ee56633ca 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -6820,9 +6820,9 @@ class Window(EvtHandler): """ return _core_.Window_SetBackgroundColour(*args, **kwargs) - def SetDefaultBackgroundColour(*args, **kwargs): - """SetDefaultBackgroundColour(self, Colour colour)""" - return _core_.Window_SetDefaultBackgroundColour(*args, **kwargs) + def SetOwnBackroundColour(*args, **kwargs): + """SetOwnBackroundColour(self, Colour colour)""" + return _core_.Window_SetOwnBackroundColour(*args, **kwargs) def SetForegroundColour(*args, **kwargs): """ @@ -6835,9 +6835,9 @@ class Window(EvtHandler): """ return _core_.Window_SetForegroundColour(*args, **kwargs) - def SetDefaultForegroundColour(*args, **kwargs): - """SetDefaultForegroundColour(self, Colour colour)""" - return _core_.Window_SetDefaultForegroundColour(*args, **kwargs) + def SetOwnForegroundColour(*args, **kwargs): + """SetOwnForegroundColour(self, Colour colour)""" + return _core_.Window_SetOwnForegroundColour(*args, **kwargs) def GetBackgroundColour(*args, **kwargs): """ @@ -6885,9 +6885,9 @@ class Window(EvtHandler): """ return _core_.Window_SetFont(*args, **kwargs) - def SetDefaultFont(*args, **kwargs): - """SetDefaultFont(self, Font font)""" - return _core_.Window_SetDefaultFont(*args, **kwargs) + def SetOwnFont(*args, **kwargs): + """SetOwnFont(self, Font font)""" + return _core_.Window_SetOwnFont(*args, **kwargs) def GetFont(*args, **kwargs): """ @@ -7356,7 +7356,7 @@ class Window(EvtHandler): By 'intelligently' the following is meant: by default, all windows use their own default attributes. However if some of the parent's attributes are explicitly changed (that is, using SetFont and not - SetDefaultFont) and if the corresponding attribute hadn't been + SetOwnFont) and if the corresponding attribute hadn't been explicitly set for this window itself, then this window takes the same value as used by the parent. In addition, if the window overrides ShouldInheritColours to return false, the colours will not be changed diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index d419ae6fb8..1e176d2e3d 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -26120,7 +26120,7 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args } -static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnBackroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxColour *arg2 = 0 ; @@ -26131,7 +26131,7 @@ static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObjec (char *) "self",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultBackgroundColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnBackroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -26140,7 +26140,7 @@ static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultBackgroundColour((wxColour const &)*arg2); + (arg1)->SetOwnBackroundColour((wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26187,7 +26187,7 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args } -static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxColour *arg2 = 0 ; @@ -26198,7 +26198,7 @@ static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObjec (char *) "self",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultForegroundColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnForegroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -26207,7 +26207,7 @@ static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultForegroundColour((wxColour const &)*arg2); + (arg1)->SetOwnForegroundColour((wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26383,7 +26383,7 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxFont *arg2 = 0 ; @@ -26393,7 +26393,7 @@ static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyO (char *) "self",(char *) "font", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultFont",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnFont",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, @@ -26405,7 +26405,7 @@ static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultFont((wxFont const &)*arg2); + (arg1)->SetOwnFont((wxFont const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -40816,15 +40816,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultBackgroundColour", (PyCFunction) _wrap_Window_SetDefaultBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnBackroundColour", (PyCFunction) _wrap_Window_SetOwnBackroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultForegroundColour", (PyCFunction) _wrap_Window_SetDefaultForegroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnForegroundColour", (PyCFunction) _wrap_Window_SetOwnForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetForegroundColour", (PyCFunction) _wrap_Window_GetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCursor", (PyCFunction) _wrap_Window_SetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCursor", (PyCFunction) _wrap_Window_GetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetFont", (PyCFunction) _wrap_Window_SetFont, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultFont", (PyCFunction) _wrap_Window_SetDefaultFont, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnFont", (PyCFunction) _wrap_Window_SetOwnFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetFont", (PyCFunction) _wrap_Window_GetFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCaret", (PyCFunction) _wrap_Window_SetCaret, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCaret", (PyCFunction) _wrap_Window_GetCaret, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 22e9ea9051..4ee56633ca 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -6820,9 +6820,9 @@ class Window(EvtHandler): """ return _core_.Window_SetBackgroundColour(*args, **kwargs) - def SetDefaultBackgroundColour(*args, **kwargs): - """SetDefaultBackgroundColour(self, Colour colour)""" - return _core_.Window_SetDefaultBackgroundColour(*args, **kwargs) + def SetOwnBackroundColour(*args, **kwargs): + """SetOwnBackroundColour(self, Colour colour)""" + return _core_.Window_SetOwnBackroundColour(*args, **kwargs) def SetForegroundColour(*args, **kwargs): """ @@ -6835,9 +6835,9 @@ class Window(EvtHandler): """ return _core_.Window_SetForegroundColour(*args, **kwargs) - def SetDefaultForegroundColour(*args, **kwargs): - """SetDefaultForegroundColour(self, Colour colour)""" - return _core_.Window_SetDefaultForegroundColour(*args, **kwargs) + def SetOwnForegroundColour(*args, **kwargs): + """SetOwnForegroundColour(self, Colour colour)""" + return _core_.Window_SetOwnForegroundColour(*args, **kwargs) def GetBackgroundColour(*args, **kwargs): """ @@ -6885,9 +6885,9 @@ class Window(EvtHandler): """ return _core_.Window_SetFont(*args, **kwargs) - def SetDefaultFont(*args, **kwargs): - """SetDefaultFont(self, Font font)""" - return _core_.Window_SetDefaultFont(*args, **kwargs) + def SetOwnFont(*args, **kwargs): + """SetOwnFont(self, Font font)""" + return _core_.Window_SetOwnFont(*args, **kwargs) def GetFont(*args, **kwargs): """ @@ -7356,7 +7356,7 @@ class Window(EvtHandler): By 'intelligently' the following is meant: by default, all windows use their own default attributes. However if some of the parent's attributes are explicitly changed (that is, using SetFont and not - SetDefaultFont) and if the corresponding attribute hadn't been + SetOwnFont) and if the corresponding attribute hadn't been explicitly set for this window itself, then this window takes the same value as used by the parent. In addition, if the window overrides ShouldInheritColours to return false, the colours will not be changed diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index d419ae6fb8..1e176d2e3d 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -26120,7 +26120,7 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args } -static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnBackroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxColour *arg2 = 0 ; @@ -26131,7 +26131,7 @@ static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObjec (char *) "self",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultBackgroundColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnBackroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -26140,7 +26140,7 @@ static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultBackgroundColour((wxColour const &)*arg2); + (arg1)->SetOwnBackroundColour((wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26187,7 +26187,7 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args } -static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxColour *arg2 = 0 ; @@ -26198,7 +26198,7 @@ static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObjec (char *) "self",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultForegroundColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnForegroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -26207,7 +26207,7 @@ static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultForegroundColour((wxColour const &)*arg2); + (arg1)->SetOwnForegroundColour((wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26383,7 +26383,7 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxFont *arg2 = 0 ; @@ -26393,7 +26393,7 @@ static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyO (char *) "self",(char *) "font", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultFont",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnFont",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, @@ -26405,7 +26405,7 @@ static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultFont((wxFont const &)*arg2); + (arg1)->SetOwnFont((wxFont const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -40816,15 +40816,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultBackgroundColour", (PyCFunction) _wrap_Window_SetDefaultBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnBackroundColour", (PyCFunction) _wrap_Window_SetOwnBackroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultForegroundColour", (PyCFunction) _wrap_Window_SetDefaultForegroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnForegroundColour", (PyCFunction) _wrap_Window_SetOwnForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetForegroundColour", (PyCFunction) _wrap_Window_GetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCursor", (PyCFunction) _wrap_Window_SetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCursor", (PyCFunction) _wrap_Window_GetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetFont", (PyCFunction) _wrap_Window_SetFont, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultFont", (PyCFunction) _wrap_Window_SetDefaultFont, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnFont", (PyCFunction) _wrap_Window_SetOwnFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetFont", (PyCFunction) _wrap_Window_GetFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCaret", (PyCFunction) _wrap_Window_SetCaret, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCaret", (PyCFunction) _wrap_Window_GetCaret, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 746238a9dd..1ada3e931c 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -6820,9 +6820,9 @@ class Window(EvtHandler): """ return _core_.Window_SetBackgroundColour(*args, **kwargs) - def SetDefaultBackgroundColour(*args, **kwargs): - """SetDefaultBackgroundColour(self, Colour colour)""" - return _core_.Window_SetDefaultBackgroundColour(*args, **kwargs) + def SetOwnBackroundColour(*args, **kwargs): + """SetOwnBackroundColour(self, Colour colour)""" + return _core_.Window_SetOwnBackroundColour(*args, **kwargs) def SetForegroundColour(*args, **kwargs): """ @@ -6835,9 +6835,9 @@ class Window(EvtHandler): """ return _core_.Window_SetForegroundColour(*args, **kwargs) - def SetDefaultForegroundColour(*args, **kwargs): - """SetDefaultForegroundColour(self, Colour colour)""" - return _core_.Window_SetDefaultForegroundColour(*args, **kwargs) + def SetOwnForegroundColour(*args, **kwargs): + """SetOwnForegroundColour(self, Colour colour)""" + return _core_.Window_SetOwnForegroundColour(*args, **kwargs) def GetBackgroundColour(*args, **kwargs): """ @@ -6885,9 +6885,9 @@ class Window(EvtHandler): """ return _core_.Window_SetFont(*args, **kwargs) - def SetDefaultFont(*args, **kwargs): - """SetDefaultFont(self, Font font)""" - return _core_.Window_SetDefaultFont(*args, **kwargs) + def SetOwnFont(*args, **kwargs): + """SetOwnFont(self, Font font)""" + return _core_.Window_SetOwnFont(*args, **kwargs) def GetFont(*args, **kwargs): """ @@ -7369,7 +7369,7 @@ class Window(EvtHandler): By 'intelligently' the following is meant: by default, all windows use their own default attributes. However if some of the parent's attributes are explicitly changed (that is, using SetFont and not - SetDefaultFont) and if the corresponding attribute hadn't been + SetOwnFont) and if the corresponding attribute hadn't been explicitly set for this window itself, then this window takes the same value as used by the parent. In addition, if the window overrides ShouldInheritColours to return false, the colours will not be changed diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index edaddf6774..8285b38b0c 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -26118,7 +26118,7 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args } -static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnBackroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxColour *arg2 = 0 ; @@ -26129,7 +26129,7 @@ static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObjec (char *) "self",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultBackgroundColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnBackroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -26138,7 +26138,7 @@ static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultBackgroundColour((wxColour const &)*arg2); + (arg1)->SetOwnBackroundColour((wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26185,7 +26185,7 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args } -static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxColour *arg2 = 0 ; @@ -26196,7 +26196,7 @@ static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObjec (char *) "self",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultForegroundColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnForegroundColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { @@ -26205,7 +26205,7 @@ static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultForegroundColour((wxColour const &)*arg2); + (arg1)->SetOwnForegroundColour((wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26381,7 +26381,7 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetOwnFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxFont *arg2 = 0 ; @@ -26391,7 +26391,7 @@ static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyO (char *) "self",(char *) "font", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultFont",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetOwnFont",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, @@ -26403,7 +26403,7 @@ static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDefaultFont((wxFont const &)*arg2); + (arg1)->SetOwnFont((wxFont const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -41316,15 +41316,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultBackgroundColour", (PyCFunction) _wrap_Window_SetDefaultBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnBackroundColour", (PyCFunction) _wrap_Window_SetOwnBackroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultForegroundColour", (PyCFunction) _wrap_Window_SetDefaultForegroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnForegroundColour", (PyCFunction) _wrap_Window_SetOwnForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetForegroundColour", (PyCFunction) _wrap_Window_GetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCursor", (PyCFunction) _wrap_Window_SetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCursor", (PyCFunction) _wrap_Window_GetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetFont", (PyCFunction) _wrap_Window_SetFont, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetDefaultFont", (PyCFunction) _wrap_Window_SetDefaultFont, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetOwnFont", (PyCFunction) _wrap_Window_SetOwnFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetFont", (PyCFunction) _wrap_Window_GetFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCaret", (PyCFunction) _wrap_Window_SetCaret, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCaret", (PyCFunction) _wrap_Window_GetCaret, METH_VARARGS | METH_KEYWORDS },