From 7383cf9d17037a789e4ae022b310e88d192fd0ac Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 21 Oct 2005 14:50:29 +0000
Subject: [PATCH] Fixed warning, move caret in OnPaint

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/richtext/richtextctrl.cpp | 2 +-
 src/richtext/richtextxml.cpp  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 8e8ec62272..ea46d5f76d 100644
--- 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();
-        PositionCaret();
     }
+    PositionCaret();
 
     GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
 }
diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index f8d267d2e4..cec140e5c4 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -339,6 +339,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const wxString& s)
     return stream;
 }
 
+#if 0
 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;
 }
+#endif
 
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
-- 
2.45.2