wxCaret MSW bug fixes

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

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 00df1d0b0dfc93c437f2d19a23d82c61dc7c7c02..3f41e9b3ac28d7be099572ee4f28ef417b2d59dc 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -265,6 +265,8 @@ MyCanvas::MyCanvas( wxWindow *parent )
                             wxDefaultPosition, wxDefaultSize,
                             wxSUNKEN_BORDER )
 {
+    m_text = (char *)NULL;
+
     SetBackgroundColour(* wxWHITE);
 
     m_font = *wxNORMAL_FONT;
@@ -282,8 +284,6 @@ MyCanvas::MyCanvas( wxWindow *parent )
     m_xMargin = m_yMargin = 5;
     m_caret.Move(m_xMargin, m_yMargin);
     m_caret.Show();
-
-    m_text = (char *)NULL;
 }
 
 MyCanvas::~MyCanvas()

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index 29ec0e3f03f1a35130187d14b4388efca8d65d6d..a6fbf355255bbc2067cd26b6e63ce820512cdffe 100644 (file)
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -154,10 +154,12 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
-    wxASSERT_MSG( m_hasCaret, "cannot move non existent caret" );
-
-    if ( !::SetCaretPos(m_x, m_y) )
+    if ( m_hasCaret )
     {
-        wxLogLastError("SetCaretPos");
+        if ( !::SetCaretPos(m_x, m_y) )
+        {
+            wxLogLastError("SetCaretPos");
+        }
     }
+    //else: we don't have caret right now, nothing to do (this does happen)
 }