more fixes for mingw32 compilation

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

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index 5378bc1f8f898f423fd92939e6efb2d74b8bc449..daf68049e9be3a1a451283479536c1ad0f5d7b17 100644 (file)
--- 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;
@@ -160,3 +162,19 @@ void wxCaret::DoMove()
     }
     //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();
+    }
+}