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

Add wx.TextAttr.Merge

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-05-06 22:41:13 +00:00
parent c9c537e6b0
commit 68d76e7385
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wxPython/src/_textctrl.i
View File

@@ -128,6 +128,16 @@ public:
// operations // operations
void Init(); void Init();
// merges the attributes of the base and the overlay objects and returns
// the result; the parameter attributes take precedence
//
// WARNING: the order of arguments is the opposite of Combine()
static wxTextAttr Merge(const wxTextAttr& base, const wxTextAttr& overlay);
// // merges the attributes of this object and overlay
// void Merge(const wxTextAttr& overlay);
// setters // setters
void SetTextColour(const wxColour& colText); void SetTextColour(const wxColour& colText);
void SetBackgroundColour(const wxColour& colBack); void SetBackgroundColour(const wxColour& colBack);