Fixed wxRichTextCtrl caret test case

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 3d7a97adb4d8246b0b25b2188907f98f35b0e564..721db6b872f49ecaa09fa233c0d71af0c3abf68f 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -2208,7 +2208,7 @@ bool wxRichTextCtrl::MoveToParagraphStart(int flags)
         if (!extendSel)
             SelectNone();
 
         if (!extendSel)
             SelectNone();
 

-        SetCaretPosition(newPos);
+        SetCaretPosition(newPos, true);

         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 


@@ -3174,6 +3174,7 @@ void wxRichTextCtrl::SetInsertionPoint(long pos)
     SelectNone();
 
     m_caretPosition = pos - 1;
     SelectNone();
 
     m_caretPosition = pos - 1;

+    m_caretAtLineStart = true;

 
     PositionCaret();
 
 
     PositionCaret();
 

diff --git a/tests/controls/richtextctrltest.cpp b/tests/controls/richtextctrltest.cpp
index 087a07b5c62a2c44b748a75bec34517353e0382b..f3813de3c5355b1c94e4e1873665e0370e736fe1 100644 (file)
--- a/tests/controls/richtextctrltest.cpp
+++ b/tests/controls/richtextctrltest.cpp
@@ -350,7 +350,7 @@ void RichTextCtrlTestCase::CaretPosition()
     m_rich->AddParagraph("This is paragraph one");
     m_rich->AddParagraph("Paragraph two\n has \nlots of\n lines");
 
     m_rich->AddParagraph("This is paragraph one");
     m_rich->AddParagraph("Paragraph two\n has \nlots of\n lines");
 

-    m_rich->MoveCaret(1);
+    m_rich->SetInsertionPoint(2);

 
     CPPUNIT_ASSERT_EQUAL(1, m_rich->GetCaretPosition());
 
 
     CPPUNIT_ASSERT_EQUAL(1, m_rich->GetCaretPosition());