Fixed warnings/errors and changed Thaw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -187,11 +187,11 @@ void wxRichTextCtrl::Freeze()
|
||||
}
|
||||
|
||||
/// Call Thaw to refresh
|
||||
void wxRichTextCtrl::Thaw(bool refresh)
|
||||
void wxRichTextCtrl::Thaw()
|
||||
{
|
||||
m_freezeCount --;
|
||||
|
||||
if (m_freezeCount == 0 && refresh)
|
||||
if (m_freezeCount == 0)
|
||||
{
|
||||
SetupScrollbars();
|
||||
Refresh(false);
|
||||
@@ -435,7 +435,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
|
||||
event.GetKeyCode() == WXK_NEXT ||
|
||||
event.GetKeyCode() == WXK_END)
|
||||
{
|
||||
Navigate(event.GetKeyCode(), flags);
|
||||
KeyboardNavigate(event.GetKeyCode(), flags);
|
||||
}
|
||||
else if (event.GetKeyCode() == WXK_RETURN)
|
||||
{
|
||||
@@ -584,10 +584,9 @@ Adding Shift does the above but starts/extends selection.
|
||||
|
||||
*/
|
||||
|
||||
bool wxRichTextCtrl::Navigate(int keyCode, int flags)
|
||||
bool wxRichTextCtrl::KeyboardNavigate(int keyCode, int flags)
|
||||
{
|
||||
bool success = false;
|
||||
Freeze();
|
||||
|
||||
if (keyCode == WXK_RIGHT)
|
||||
{
|
||||
@@ -646,8 +645,6 @@ bool wxRichTextCtrl::Navigate(int keyCode, int flags)
|
||||
SetDefaultStyleToCursorStyle();
|
||||
}
|
||||
|
||||
Thaw(false);
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user