Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetDefaultXXX -> SetOwnXXX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-30 17:12:03 +00:00
parent 4d0f796587
commit fa47d7a7ad
14 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
docs/latex/wx/window.tex
View File

@@ -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}

6
include/wx/window.h
View File

@@ -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;

16
src/generic/grid.cpp
View File

@@ -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_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->SetDefaultForegroundColour(gfg);
m_gridWin->SetDefaultBackgroundColour(gbg);
m_gridWin->SetOwnForegroundColour(gfg);
m_gridWin->SetOwnBackgroundColour(gbg);
Init();
}

18
src/generic/listctrl.cpp
View File

@@ -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()

6
src/generic/treectlg.cpp
View File

@@ -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 );

14
wxPython/docs/xml/wxPython-metadata.xml
View File

@@ -4832,8 +4832,8 @@ modules.</docstring>
<param name="colour" type="wxColour" default=""/>
</paramlist>
</method>
<method name="SetDefaultBackgroundColour" type="" overloaded="no">
<autodoc>SetDefaultBackgroundColour(self, Colour colour)</autodoc>
<method name="SetOwnBackroundColour" type="" overloaded="no">
<autodoc>SetOwnBackroundColour(self, Colour colour)</autodoc>
<paramlist>
<param name="colour" type="wxColour" default=""/>
</paramlist>
@@ -4848,8 +4848,8 @@ not be used at all.</docstring>
<param name="colour" type="wxColour" default=""/>
</paramlist>
</method>
<method name="SetDefaultForegroundColour" type="" overloaded="no">
<autodoc>SetDefaultForegroundColour(self, Colour colour)</autodoc>
<method name="SetOwnForegroundColour" type="" overloaded="no">
<autodoc>SetOwnForegroundColour(self, Colour colour)</autodoc>
<paramlist>
<param name="colour" type="wxColour" default=""/>
</paramlist>
@@ -4886,8 +4886,8 @@ be reset back to default.</docstring>
<param name="font" type="wxFont" default=""/>
</paramlist>
</method>
<method name="SetDefaultFont" type="" overloaded="no">
<autodoc>SetDefaultFont(self, Font font)</autodoc>
<method name="SetOwnFont" type="" overloaded="no">
<autodoc>SetOwnFont(self, Font font)</autodoc>
<paramlist>
<param name="font" type="wxFont" default=""/>
</paramlist>
@@ -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

4
wxPython/misc/widgetLayoutTest.py
View File

@@ -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)

8
wxPython/src/_window.i
View File

@@ -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

20
wxPython/src/gtk/_core.py
View File

@@ -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

24
wxPython/src/gtk/_core_wrap.cpp
View File

@@ -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 },

20
wxPython/src/mac/_core.py
View File

@@ -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

24
wxPython/src/mac/_core_wrap.cpp
View File

@@ -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 },

20
wxPython/src/msw/_core.py
View File

@@ -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

24
wxPython/src/msw/_core_wrap.cpp
View File

@@ -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 },