// Modified by:
// Created: 23.05.99
// RCS-ID: $Id$
-// Copyright: (c) wxWindows team
+// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "caret.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/caret.h"
+#if wxUSE_CARET
+
#include "wx/msw/private.h"
// ---------------------------------------------------------------------------
// macros
// ---------------------------------------------------------------------------
-// under Win16 the caret APIs are void but under Win32 they may return an
-// error code which we want to check - this macro does just this
-#ifdef __WIN16__
- #define CALL_CARET_API(api, args) api args
-#else // Win32
- #define CALL_CARET_API(api, args) \
+#define CALL_CARET_API(api, args) \
if ( !api args ) \
- wxLogLastError(_T(#api))
-#endif // Win16/32
+ wxLogLastError(wxT(#api))
// ===========================================================================
// implementation
CALL_CARET_API(CreateCaret, (GetWinHwnd(GetWindow()), 0,
m_width, m_height));
- m_hasCaret = TRUE;
+ m_hasCaret = true;
}
return m_hasCaret;
{
if ( m_hasCaret )
{
- m_hasCaret = FALSE;
+ m_hasCaret = false;
CALL_CARET_API(DestroyCaret, ());
}
wxASSERT_MSG( GetWindow(), wxT("caret without window cannot be shown") );
wxASSERT_MSG( IsOk(), wxT("caret of zero size cannot be shown") );
+ // 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()) )
+ {
+ if ( MSWCreateCaret() )
+ {
+ DoMove();
+ }
+ }
+
if ( m_hasCaret )
{
CALL_CARET_API(ShowCaret, (GetWinHwnd(GetWindow())));
wxASSERT_MSG( wxWindow::FindFocus() == GetWindow(),
wxT("how did we lose focus?") );
- CALL_CARET_API(SetCaretPos, (m_x, m_y));
+ // 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 ( m_hasCaret )
{
- m_hasCaret = FALSE;
+ m_hasCaret = false;
CALL_CARET_API(DestroyCaret, ());
MSWCreateCaret();
- DoMove();
+ OnSetFocus();
}
}
+
+#endif