Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed warnings/errors and changed Thaw

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-25 17:51:10 +00:00
parent d9f42a9e5a
commit 0bab774ba3
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/richtext/richtextctrl.h
View File

@@ -231,7 +231,7 @@ public:
virtual void Freeze(); virtual void Freeze();
/// Call Thaw to refresh /// Call Thaw to refresh
virtual void Thaw(bool refresh = true); virtual void Thaw();
/// Call Thaw to refresh /// Call Thaw to refresh
virtual bool IsFrozen() const { return m_freezeCount > 0; } virtual bool IsFrozen() const { return m_freezeCount > 0; }
@@ -584,7 +584,7 @@ public:
virtual void SetupScrollbars(bool atTop = false); virtual void SetupScrollbars(bool atTop = false);
/// Keyboard navigation /// Keyboard navigation
virtual bool Navigate(int keyCode, int flags); virtual bool KeyboardNavigate(int keyCode, int flags);
/// Paint the background /// Paint the background
virtual void PaintBackground(wxDC& dc); virtual void PaintBackground(wxDC& dc);

11
src/richtext/richtextctrl.cpp
View File

@@ -187,11 +187,11 @@ void wxRichTextCtrl::Freeze()
} }
/// Call Thaw to refresh /// Call Thaw to refresh
void wxRichTextCtrl::Thaw(bool refresh) void wxRichTextCtrl::Thaw()
{ {
m_freezeCount --; m_freezeCount --;
if (m_freezeCount == 0 && refresh) if (m_freezeCount == 0)
{ {
SetupScrollbars(); SetupScrollbars();
Refresh(false); Refresh(false);
@@ -435,7 +435,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
event.GetKeyCode() == WXK_NEXT || event.GetKeyCode() == WXK_NEXT ||
event.GetKeyCode() == WXK_END) event.GetKeyCode() == WXK_END)
{ {
Navigate(event.GetKeyCode(), flags); KeyboardNavigate(event.GetKeyCode(), flags);
} }
else if (event.GetKeyCode() == WXK_RETURN) 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; bool success = false;
Freeze();
if (keyCode == WXK_RIGHT) if (keyCode == WXK_RIGHT)
{ {
@@ -646,8 +645,6 @@ bool wxRichTextCtrl::Navigate(int keyCode, int flags)
SetDefaultStyleToCursorStyle(); SetDefaultStyleToCursorStyle();
} }
Thaw(false);
return success; return success;
} }

12
src/richtext/richtextxml.cpp
View File

@@ -272,8 +272,16 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
{ {
if (str.empty()) return; if (str.empty()) return;
#if wxUSE_UNICODE #if wxUSE_UNICODE
const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8)); if (convFile)
stream.Write((const char*)buf, strlen((const char*)buf)); {
const wxWX2MBbuf buf(str.mb_str(*convFile));
stream.Write((const char*)buf, strlen((const char*)buf));
}
else
{
const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
stream.Write((const char*)buf, strlen((const char*)buf));
}
#else #else
if ( convFile == NULL ) if ( convFile == NULL )
stream.Write(str.mb_str(), str.Len()); stream.Write(str.mb_str(), str.Len());