Rename wxWebHistoryItem to wxWebViewHistoryItem.

[wxWidgets.git] / src / richtext / richtextctrl.cpp

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index abc5b0f6beb3b333474294e0f1ce747aa94f549e..f5039443c53ca55def1aacda60d6fd5128189d2d 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -568,12 +568,7 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
 
         // For now, don't handle shift-click when we're selecting multiple objects.
         if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal)
 
         // For now, don't handle shift-click when we're selecting multiple objects.
         if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal)

-        {
-            if (!m_selection.IsValid())
-                ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
-            else
-                ExtendSelection(m_caretPosition, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
-        }
+            ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);

         else
             SelectNone();
     }
         else
             SelectNone();
     }


@@ -2930,13 +2925,19 @@ void wxRichTextCtrl::SetSelection(long from, long to)
 // Editing
 // ----------------------------------------------------------------------------
 
 // Editing
 // ----------------------------------------------------------------------------
 

-void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to),
+void wxRichTextCtrl::Replace(long from, long to,

                              const wxString& value)
 {
     BeginBatchUndo(_("Replace"));
 
                              const wxString& value)
 {
     BeginBatchUndo(_("Replace"));
 

+    SetSelection(from, to);
+
+    wxRichTextAttr attr = GetDefaultStyle();
+

     DeleteSelectedContent();
 
     DeleteSelectedContent();
 

+    SetDefaultStyle(attr);
+

     DoWriteText(value, SetValue_SelectionOnly);
 
     EndBatchUndo();
     DoWriteText(value, SetValue_SelectionOnly);
 
     EndBatchUndo();