Layout corrections

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index f82ffe87076ada26ec2736c9e72523f354c539b8..14b77e9b1d8b73883d1b14a646c2880b92961fde 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -229,7 +229,10 @@ void wxRichTextCtrl::Thaw()
 
     if (m_freezeCount == 0)
     {
 
     if (m_freezeCount == 0)
     {

-        SetupScrollbars();
+        if (GetBuffer().GetDirty())
+            LayoutContent();
+        else
+            SetupScrollbars();

         Refresh(false);
     }
 }
         Refresh(false);
     }
 }


@@ -244,11 +247,9 @@ void wxRichTextCtrl::Clear()
     m_caretAtLineStart = false;
     m_selectionRange.SetRange(-2, -2);
 
     m_caretAtLineStart = false;
     m_selectionRange.SetRange(-2, -2);
 

-    SetScrollbars(0, 0, 0, 0, 0, 0);
-

     if (m_freezeCount == 0)
     {
     if (m_freezeCount == 0)
     {

-        SetupScrollbars();
+        LayoutContent();

         Refresh(false);
     }
     SendTextUpdatedEvent();
         Refresh(false);
     }
     SendTextUpdatedEvent();