X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65c12361f3f1428628476547c4087cf3cbb9c105..c67d6888d421207045dc6ce9c9762727118c92e2:/include/wx/textctrl.h?ds=sidebyside

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 49abd90947..05d53de239 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -45,6 +45,7 @@
 #endif
 
 class WXDLLEXPORT wxTextCtrl;
+class WXDLLEXPORT wxTextCtrlBase;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -123,6 +124,13 @@ public:
         return !HasTextColour() && !HasBackgroundColour() && !HasFont();
     }
 
+    // return the attribute having the valid font and colours: it uses the
+    // attributes set in attr and falls back first to attrDefault and then to
+    // the text control font/colours for those attributes which are not set
+    static wxTextAttr Combine(const wxTextAttr& attr,
+                              const wxTextAttr& attrDef,
+                              const wxTextCtrlBase *text);
+
 private:
     wxColour m_colText,
              m_colBack;