SetDefaultXXX -> SetOwnXXX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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 },
|
||||
|
Reference in New Issue
Block a user