fixing osx_cocoa

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

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index a043aa174aaaa9576498f2cdd2182f290989c58c..4252a732f1dff941723f7577364a066147845159 100644 (file)
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/caret.cpp
+// Name:        src/msw/caret.cpp

 // Purpose:     MSW implementation of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
 // Purpose:     MSW implementation of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "caret.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -43,9 +39,11 @@
 // macros
 // ---------------------------------------------------------------------------
 
 // macros
 // ---------------------------------------------------------------------------
 

-#define CALL_CARET_API(api, args)   \
-        if ( !api args )                \
-            wxLogLastError(_T(#api))
+#define CALL_CARET_API(api, args) \
+        if ( !api args ) \
+        { \
+            wxLogLastError(wxT(#api)); \
+        }

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -87,7 +85,7 @@ bool wxCaret::MSWCreateCaret()
         CALL_CARET_API(CreateCaret, (GetWinHwnd(GetWindow()), 0,
                                      m_width, m_height));
 
         CALL_CARET_API(CreateCaret, (GetWinHwnd(GetWindow()), 0,
                                      m_width, m_height));
 

-        m_hasCaret = TRUE;
+        m_hasCaret = true;

     }
 
     return m_hasCaret;
     }
 
     return m_hasCaret;


@@ -113,7 +111,7 @@ void wxCaret::OnKillFocus()
 {
     if ( m_hasCaret )
     {
 {
     if ( m_hasCaret )
     {

-        m_hasCaret = FALSE;
+        m_hasCaret = false;

 
         CALL_CARET_API(DestroyCaret, ());
     }
 
         CALL_CARET_API(DestroyCaret, ());
     }


@@ -182,7 +180,7 @@ void wxCaret::DoSize()
 {
     if ( m_hasCaret )
     {
 {
     if ( m_hasCaret )
     {

-        m_hasCaret = FALSE;
+        m_hasCaret = false;

         CALL_CARET_API(DestroyCaret, ());
         MSWCreateCaret();
         OnSetFocus();
         CALL_CARET_API(DestroyCaret, ());
         MSWCreateCaret();
         OnSetFocus();