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

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