added wxTextAttr::Merge (modified patch 1482719)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -131,6 +131,7 @@ All (GUI):
 - Added an easier to use wxMenu::AppendSubMenu()
 - wxString <-> wxColour conversions in wxColour class (Francesco Montorsi).
 - Fixed bug with ignoring blank lines in multiline wxGrid cell labels
+- Added wxTextAttr::Merge() (Marcin Simonides)
 
 wxMSW:
 

docs/latex/wx/text.tex

@@ -197,6 +197,20 @@ Returns a bitlist indicating which attributes will be set.
 Returns {\tt true} if this style specifies any non-default attributes.
 
 
+\membersection{wxTextAttr::Merge}\label{wxtextattrmerge}
+
+\func{void}{Merge}{\param{const wxTextAttr\&}{ overlay}}
+
+Copies all defined/valid properties from \arg{overlay} to current object.
+
+\func{static wxTextAttr}{Merge}{\param{const wxTextAttr\&}{ base}, \param{const wxTextAttr\&}{ overlay}}
+
+Creates a new {\tt wxTextAttr} which is a merge of \arg{base} and 
+\arg{overlay}. Properties defined in \arg{overlay} take precedence over those
+in \arg{base}. Properties undefined/invalid in both are undefined in the
+result.
+
+
 \membersection{wxTextAttr::SetAlignment}\label{wxtextattrsetalignment}
 
 \func{void}{SetAlignment}{\param{wxTextAttrAlignment}{ alignment}}

include/wx/textctrl.h

@@ -197,6 +197,22 @@ 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)
+    {
+        return Combine(overlay, base, NULL);
+    }
+
+    // merges the attributes of this object and overlay
+    void Merge(const wxTextAttr& overlay)
+    {
+        *this = Merge(*this, overlay);
+    }
+
+
     // operators
     void operator= (const wxTextAttr& attr);