Fixed warning, move caret in OnPaint

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 8e8ec6227247268dbb7e41f90e33e0c02e9de72d..ea46d5f76d01cc27feeaa1dcdf4cd6a460ff9a9c 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -243,8 +243,8 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
         GetBuffer().SetDirty(false);
         SetupScrollbars();
         GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
         GetBuffer().SetDirty(false);
         SetupScrollbars();

-        PositionCaret();

     }
     }

+    PositionCaret();

 
     GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
 }
 
     GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
 }

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index f8d267d2e4dbc2800315ab5d06dd5a7de67484d4..cec140e5c4a99a167f95ee0a7474412f3ca8b7f7 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -339,6 +339,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const wxString& s)
     return stream;
 }
 
     return stream;
 }
 

+#if 0

 static wxOutputStream& operator <<(wxOutputStream& stream, long l)
 {
     wxString str;
 static wxOutputStream& operator <<(wxOutputStream& stream, long l)
 {
     wxString str;


@@ -352,6 +353,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const char c)
     str.Printf(wxT("%c"), c);
     return stream << str;
 }
     str.Printf(wxT("%c"), c);
     return stream << str;
 }

+#endif

 
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
 
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)