From 68d76e73855675ab690686ed0fd1d9407a25fdb2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 6 May 2006 22:41:13 +0000 Subject: [PATCH] Add wx.TextAttr.Merge git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_textctrl.i | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i index fa9885c807..acf79226fc 100644 --- a/wxPython/src/_textctrl.i +++ b/wxPython/src/_textctrl.i @@ -128,6 +128,16 @@ public: // operations 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 void SetTextColour(const wxColour& colText); void SetBackgroundColour(const wxColour& colBack); -- 2.47.2