Visualage C++ V4.0 duplicate symbol fixes

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

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index 5ed485132ea0544c8bb5f44fe5f731399367914f..cacc6801f5128bac973e5c83bb454e2b05f7a1a4 100644 (file)
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -81,8 +81,8 @@ void wxCaretBase::SetBlinkTime(int milliseconds)
 
 bool wxCaret::MSWCreateCaret()
 {
 
 bool wxCaret::MSWCreateCaret()
 {

-    wxASSERT_MSG( GetWindow(), _T("caret without window cannot be created") );
-    wxASSERT_MSG( IsOk(),  _T("caret of zero size cannot be created") );
+    wxASSERT_MSG( GetWindow(), wxT("caret without window cannot be created") );
+    wxASSERT_MSG( IsOk(),  wxT("caret of zero size cannot be created") );

 
     if ( !m_hasCaret )
     {
 
     if ( !m_hasCaret )
     {


@@ -127,8 +127,8 @@ void wxCaret::OnKillFocus()
 
 void wxCaret::DoShow()
 {
 
 void wxCaret::DoShow()
 {

-    wxASSERT_MSG( GetWindow(), _T("caret without window cannot be shown") );
-    wxASSERT_MSG( IsOk(), _T("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") );

 
     if ( m_hasCaret )
     {
 
     if ( m_hasCaret )
     {


@@ -153,10 +153,26 @@ void wxCaret::DoMove()
 {
     if ( m_hasCaret )
     {
 {
     if ( m_hasCaret )
     {

-        wxWindow *winFocus = wxWindow::FindFocus();
-        wxASSERT_MSG( winFocus == GetWindow(), "how did we lose focus?" );
+        wxASSERT_MSG( wxWindow::FindFocus() == GetWindow(),
+                      wxT("how did we lose focus?") );

 
         CALL_CARET_API(SetCaretPos, (m_x, m_y));
     }
     //else: we don't have caret right now, nothing to do (this does happen)
 }
 
         CALL_CARET_API(SetCaretPos, (m_x, m_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();
+    }
+}