Unhide problem of ambiguity in wxSoundBase::Play.

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

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index 29ec0e3f03f1a35130187d14b4388efca8d65d6d..f6b34dba8a247f585479b99b1c1426648c55bf6f 100644 (file)
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$

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

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


@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "caret.h"
 #endif
 
     #pragma implementation "caret.h"
 #endif
 


@@ -30,12 +30,23 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/caret.h"
 
 #endif // WX_PRECOMP
 
 #include "wx/caret.h"
 

+#if wxUSE_CARET
+

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

+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+#define CALL_CARET_API(api, args)   \
+        if ( !api args )                \
+            wxLogLastError(_T(#api))
+

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


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

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

     }
 
     return blinkTime;
     }
 
     return blinkTime;


@@ -59,10 +70,7 @@ int wxCaretBase::GetBlinkTime()
 //static
 void wxCaretBase::SetBlinkTime(int milliseconds)
 {
 //static
 void wxCaretBase::SetBlinkTime(int milliseconds)
 {

-    if ( !::SetCaretBlinkTime(milliseconds) )
-    {
-        wxLogLastError("SetCaretBlinkTime");
-    }
+    CALL_CARET_API(SetCaretBlinkTime, (milliseconds));

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -71,19 +79,15 @@ void wxCaretBase::SetBlinkTime(int milliseconds)
 
 bool wxCaret::MSWCreateCaret()
 {
 
 bool wxCaret::MSWCreateCaret()
 {

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

-        if ( !::CreateCaret(GetWinHwnd(GetWindow()), 0, m_width, m_height) )
-        {
-            wxLogLastError("CreateCaret");
-        }
-        else
-        {
-            m_hasCaret = TRUE;
-        }
+        CALL_CARET_API(CreateCaret, (GetWinHwnd(GetWindow()), 0,
+                                     m_width, m_height));
+
+        m_hasCaret = TRUE;

     }
 
     return m_hasCaret;
     }
 
     return m_hasCaret;


@@ -111,10 +115,7 @@ void wxCaret::OnKillFocus()
     {
         m_hasCaret = FALSE;
 
     {
         m_hasCaret = FALSE;
 

-        if ( !::DestroyCaret() )
-        {
-            wxLogLastError("DestroyCaret");
-        }
+        CALL_CARET_API(DestroyCaret, ());

     }
 }
 
     }
 }
 


@@ -124,27 +125,32 @@ void wxCaret::OnKillFocus()
 
 void wxCaret::DoShow()
 {
 
 void wxCaret::DoShow()
 {

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

     {
     {

-        (void)MSWCreateCaret();
+        if ( MSWCreateCaret() )
+        {
+            DoMove();
+        }

     }
 
     }
 

-    if ( !::ShowCaret(GetWinHwnd(GetWindow())) )
+    if ( m_hasCaret )

     {
     {

-        wxLogLastError("ShowCaret");
+        CALL_CARET_API(ShowCaret, (GetWinHwnd(GetWindow())));

     }
     }

+    //else: will be shown when we get the focus

 }
 
 void wxCaret::DoHide()
 {
 }
 
 void wxCaret::DoHide()
 {

-    wxASSERT_MSG( m_hasCaret, "cannot hide non existent caret" );
-
-    if ( !::HideCaret(GetWinHwnd(GetWindow())) )
+    if ( m_hasCaret )

     {
     {

-        wxLogLastError("HideCaret");
+        CALL_CARET_API(HideCaret, (GetWinHwnd(GetWindow())));

     }
 }
 
     }
 }
 


@@ -154,10 +160,33 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
 
 void wxCaret::DoMove()
 {

-    wxASSERT_MSG( m_hasCaret, "cannot move non existent caret" );
+    if ( m_hasCaret )
+    {
+        wxASSERT_MSG( wxWindow::FindFocus() == GetWindow(),
+                      wxT("how did we lose focus?") );
+
+        // 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)
+}

 
 

-    if ( !::SetCaretPos(m_x, m_y) )
+
+// ---------------------------------------------------------------------------
+// resizing the caret
+// ---------------------------------------------------------------------------
+
+void wxCaret::DoSize()
+{
+    if ( m_hasCaret )

     {
     {

-        wxLogLastError("SetCaretPos");
+        m_hasCaret = FALSE;
+        CALL_CARET_API(DestroyCaret, ());
+        MSWCreateCaret();
+        OnSetFocus();

     }
 }
     }
 }

+
+#endif