adde wxSTC bakefile

[wxWidgets.git] / src / msw / caret.cpp

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index cacc6801f5128bac973e5c83bb454e2b05f7a1a4..dac2949001366dc5f681ef3731f9f137438071dd 100644 (file)
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -35,6 +35,8 @@
 
 #include "wx/caret.h"
 
 
 #include "wx/caret.h"
 

+#if wxUSE_CARET
+

 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------


@@ -46,7 +48,9 @@
 #ifdef __WIN16__
     #define CALL_CARET_API(api, args)   api args
 #else // Win32
 #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
 
 // ===========================================================================
 #endif // Win16/32
 
 // ===========================================================================


@@ -63,7 +67,7 @@ int wxCaretBase::GetBlinkTime()
     int blinkTime = ::GetCaretBlinkTime();
     if ( !blinkTime )
     {
     int blinkTime = ::GetCaretBlinkTime();
     if ( !blinkTime )
     {

-        wxLogLastError("GetCaretBlinkTime");
+        wxLogLastError(wxT("GetCaretBlinkTime"));

     }
 
     return blinkTime;
     }
 
     return blinkTime;


@@ -130,6 +134,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") );
 
     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())));
     if ( m_hasCaret )
     {
         CALL_CARET_API(ShowCaret, (GetWinHwnd(GetWindow())));


@@ -156,7 +171,10 @@ void wxCaret::DoMove()
         wxASSERT_MSG( wxWindow::FindFocus() == 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)
 }
     }
     //else: we don't have caret right now, nothing to do (this does happen)
 }


@@ -173,6 +191,8 @@ void wxCaret::DoSize()
         m_hasCaret = FALSE;
         CALL_CARET_API(DestroyCaret, ());
         MSWCreateCaret();
         m_hasCaret = FALSE;
         CALL_CARET_API(DestroyCaret, ());
         MSWCreateCaret();

-        DoMove();
+        OnSetFocus();

     }
 }
     }
 }

+
+#endif