X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..19e30148e18cc99296b26503c155e5cef59045f4:/src/msw/caret.cpp

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index e35dc6da09..f1fd767110 100644
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -46,7 +46,9 @@
 #ifdef __WIN16__
     #define CALL_CARET_API(api, args)   api args
 #else // Win32
-    #define CALL_CARET_API(api, args)   if ( !api args ) wxLogLastError(#api)
+    #define CALL_CARET_API(api, args)   \
+        if ( !api args )                \
+            wxLogLastError(_T(#api))
 #endif // Win16/32
 
 // ===========================================================================
@@ -63,7 +65,7 @@ int wxCaretBase::GetBlinkTime()
     int blinkTime = ::GetCaretBlinkTime();
     if ( !blinkTime )
     {
-        wxLogLastError("GetCaretBlinkTime");
+        wxLogLastError(wxT("GetCaretBlinkTime"));
     }
 
     return blinkTime;
@@ -130,6 +132,17 @@ void wxCaret::DoShow()
     wxASSERT_MSG( GetWindow(), wxT("caret without window cannot be shown") );
     wxASSERT_MSG( IsOk(), wxT("caret of zero size cannot be shown") );
 
+    // we might not have created the caret yet if we had got the focus first
+    // and the caret was shown later - so do it now if we have the focus but
+    // not the caret
+    if ( !m_hasCaret && (wxWindow::FindFocus() == GetWindow()) )
+    {
+        if ( MSWCreateCaret() )
+        {
+            DoMove();
+        }
+    }
+
     if ( m_hasCaret )
     {
         CALL_CARET_API(ShowCaret, (GetWinHwnd(GetWindow())));
@@ -153,10 +166,29 @@ void wxCaret::DoMove()
 {
     if ( m_hasCaret )
     {
-        wxWindow *winFocus = wxWindow::FindFocus();
-        wxASSERT_MSG( winFocus == GetWindow(), wxT("how did we lose focus?") );
+        wxASSERT_MSG( wxWindow::FindFocus() == GetWindow(),
+                      wxT("how did we lose focus?") );
 
-        CALL_CARET_API(SetCaretPos, (m_x, m_y));
+        // for compatibility with the generic version, the coordinates are
+        // client ones
+        wxPoint pt = GetWindow()->GetClientAreaOrigin();
+        CALL_CARET_API(SetCaretPos, (m_x + pt.x, m_y + pt.y));
     }
     //else: we don't have caret right now, nothing to do (this does happen)
 }
+
+
+// ---------------------------------------------------------------------------
+// resizing the caret
+// ---------------------------------------------------------------------------
+
+void wxCaret::DoSize()
+{
+    if ( m_hasCaret )
+    {
+        m_hasCaret = FALSE;
+        CALL_CARET_API(DestroyCaret, ());
+        MSWCreateCaret();
+        DoMove();
+    }
+}