X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/184144794d383a1ddd6167443f6c22a3281aa96c..745e6cb9151321982f68ce37c11bbb7e8ad990a6:/src/common/textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 0ada7cb2f2..11c063dfdd 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -69,6 +69,41 @@ wxTextCtrlBase::~wxTextCtrlBase()
 // style functions - not implemented here
 // ----------------------------------------------------------------------------
 
+/* static */
+wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
+                               const wxTextAttr& attrDef,
+                               const wxTextCtrlBase *text)
+{
+    wxFont font = attr.GetFont();
+    if ( !font.Ok() )
+    {
+        font = attrDef.GetFont();
+
+        if ( text && !font.Ok() )
+            font = text->GetFont();
+    }
+
+    wxColour colFg = attr.GetTextColour();
+    if ( !colFg.Ok() )
+    {
+        colFg = attrDef.GetTextColour();
+
+        if ( text && !colFg.Ok() )
+            colFg = text->GetForegroundColour();
+    }
+
+    wxColour colBg = attr.GetBackgroundColour();
+    if ( !colBg.Ok() )
+    {
+        colBg = attrDef.GetBackgroundColour();
+
+        if ( text && !colBg.Ok() )
+            colBg = text->GetBackgroundColour();
+    }
+
+    return wxTextAttr(colFg, colBg, font);
+}
+
 // apply styling to text range
 bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
                               const wxTextAttr& WXUNUSED(style))
@@ -78,9 +113,16 @@ bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
 }
 
 // change default text attributes
-bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr &style)
+bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
 {
-    m_defaultStyle = style;
+    // keep the old attributes if the new style doesn't specify them unless the
+    // new style is empty - then reset m_defaultStyle (as there is no other way
+    // to do it)
+    if ( style.IsDefault() )
+        m_defaultStyle = style;
+    else
+        m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
+
     return TRUE;
 }
 
@@ -236,7 +278,7 @@ bool wxTextCtrlBase::CanPaste() const
 }
 
 // ----------------------------------------------------------------------------
-// misc
+// selection and ranges
 // ----------------------------------------------------------------------------
 
 void wxTextCtrlBase::SelectAll()
@@ -244,11 +286,16 @@ void wxTextCtrlBase::SelectAll()
     SetSelection(0, GetLastPosition());
 }
 
-wxString wxTextCtrlBase::GetSelection() const
+wxString wxTextCtrlBase::GetStringSelection() const
 {
     long from, to;
     GetSelection(&from, &to);
 
+    return GetRange(from, to);
+}
+
+wxString wxTextCtrlBase::GetRange(long from, long to) const
+{
     wxString sel;
     if ( from < to )
     {