move Freeze() and Thaw() to wxWindowBase to ensure that they behave consistently (i.e. recursively, as described in the docs) in all ports; removed different duplications of freeze count from derived classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -201,7 +201,6 @@ wxRichTextCtrl::~wxRichTextCtrl()
|
||||
/// Member initialisation
|
||||
void wxRichTextCtrl::Init()
|
||||
{
|
||||
m_freezeCount = 0;
|
||||
m_contextMenu = NULL;
|
||||
m_caret = NULL;
|
||||
m_caretPosition = -1;
|
||||
@@ -217,25 +216,13 @@ void wxRichTextCtrl::Init()
|
||||
m_caretPositionForDefaultStyle = -2;
|
||||
}
|
||||
|
||||
/// Call Freeze to prevent refresh
|
||||
void wxRichTextCtrl::Freeze()
|
||||
void wxRichTextCtrl::DoThaw()
|
||||
{
|
||||
m_freezeCount ++;
|
||||
}
|
||||
|
||||
/// Call Thaw to refresh
|
||||
void wxRichTextCtrl::Thaw()
|
||||
{
|
||||
m_freezeCount --;
|
||||
|
||||
if (m_freezeCount == 0)
|
||||
{
|
||||
if (GetBuffer().GetDirty())
|
||||
LayoutContent();
|
||||
else
|
||||
SetupScrollbars();
|
||||
Refresh(false);
|
||||
}
|
||||
if (GetBuffer().GetDirty())
|
||||
LayoutContent();
|
||||
else
|
||||
SetupScrollbars();
|
||||
Refresh(false);
|
||||
}
|
||||
|
||||
/// Clear all text
|
||||
@@ -248,7 +235,7 @@ void wxRichTextCtrl::Clear()
|
||||
m_caretAtLineStart = false;
|
||||
m_selectionRange.SetRange(-2, -2);
|
||||
|
||||
if (m_freezeCount == 0)
|
||||
if (!IsFrozen())
|
||||
{
|
||||
LayoutContent();
|
||||
Refresh(false);
|
||||
@@ -269,11 +256,12 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
#else
|
||||
wxPaintDC dc(this);
|
||||
#endif
|
||||
PrepareDC(dc);
|
||||
|
||||
if (m_freezeCount > 0)
|
||||
if (IsFrozen())
|
||||
return;
|
||||
|
||||
PrepareDC(dc);
|
||||
|
||||
dc.SetFont(GetFont());
|
||||
|
||||
// Paint the background
|
||||
@@ -1789,7 +1777,7 @@ void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event)
|
||||
/// Set up scrollbars, e.g. after a resize
|
||||
void wxRichTextCtrl::SetupScrollbars(bool atTop)
|
||||
{
|
||||
if (m_freezeCount)
|
||||
if (IsFrozen())
|
||||
return;
|
||||
|
||||
if (GetBuffer().IsEmpty())
|
||||
|
Reference in New Issue
Block a user