VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index 55cd4242c956325e1ae5308c0394f582e586dbbb..5378bc1f8f898f423fd92939e6efb2d74b8bc449 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,8 +153,8 @@ void wxCaret::DoMove()
 {
     if ( m_hasCaret )
     {
 {
     if ( m_hasCaret )
     {

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

 
         CALL_CARET_API(SetCaretPos, (m_x, m_y));
     }
 
         CALL_CARET_API(SetCaretPos, (m_x, m_y));
     }