hide tree root on wxMSW in wxHtmlHelpController

[wxWidgets.git] / src / common / textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 7e081b9037dd0a918a616ac8df50ae23c6c17342..11c063dfdd95f8ccbc4a0ce2b85e769ec1d9d66d 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -115,8 +115,13 @@ bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
 // change default text attributes
 bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
 {
 // change default text attributes
 bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
 {

-    // keep the old attributes if the new style doesn't specify them
-    m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
+    // 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;
 }
 
     return TRUE;
 }


@@ -273,7 +278,7 @@ bool wxTextCtrlBase::CanPaste() const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// misc
+// selection and ranges

 // ----------------------------------------------------------------------------
 
 void wxTextCtrlBase::SelectAll()
 // ----------------------------------------------------------------------------
 
 void wxTextCtrlBase::SelectAll()


@@ -286,6 +291,11 @@ wxString wxTextCtrlBase::GetStringSelection() const
     long from, to;
     GetSelection(&from, &to);
 
     long from, to;
     GetSelection(&from, &to);
 

+    return GetRange(from, to);
+}
+
+wxString wxTextCtrlBase::GetRange(long from, long to) const
+{

     wxString sel;
     if ( from < to )
     {
     wxString sel;
     if ( from < to )
     {