projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added Unicode-friendly wxSTRINGIZE_T()
[wxWidgets.git]
/
include
/
wx
/
generic
/
caret.h
diff --git
a/include/wx/generic/caret.h
b/include/wx/generic/caret.h
index 93df894ea67ff945c51c20cbd7db91552b660b83..644917c28ae0dccbd0d62c4c5a4f73ec4fcfa07d 100644
(file)
--- a/
include/wx/generic/caret.h
+++ b/
include/wx/generic/caret.h
@@
-5,20
+5,28
@@
// Modified by:
// Created: 25.05.99
// RCS-ID: $Id$
// Modified by:
// Created: 25.05.99
// RCS-ID: $Id$
-// Copyright: (c) wxWi
ndow
s team
+// Copyright: (c) wxWi
dget
s team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#if 0 //def __GNUG__
- #pragma implementation "caret.h"
-#endif
-
#ifndef _WX_CARET_H_
#define _WX_CARET_H_
#include "wx/timer.h"
#ifndef _WX_CARET_H_
#define _WX_CARET_H_
#include "wx/timer.h"
-class wxCaret : public wxCaretBase
+class WXDLLIMPEXP_CORE wxCaret;
+
+class WXDLLEXPORT wxCaretTimer : public wxTimer
+{
+public:
+ wxCaretTimer(wxCaret *caret);
+ virtual void Notify();
+
+private:
+ wxCaret *m_caret;
+};
+
+class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase
{
public:
// ctors
{
public:
// ctors
@@
-36,13
+44,24
@@
public:
// implementation
// --------------
// implementation
// --------------
- // blink the caret once
- void Blink();
+ // called by wxWindow (not using the event tables)
+ virtual void OnSetFocus();
+ virtual void OnKillFocus();
+
+ // called by wxCaretTimer
+ void OnTimer();
protected:
virtual void DoShow();
virtual void DoHide();
virtual void DoMove();
protected:
virtual void DoShow();
virtual void DoHide();
virtual void DoMove();
+ virtual void DoSize();
+
+ // blink the caret once
+ void Blink();
+
+ // refresh the caret
+ void Refresh();
// draw the caret on the given DC
void DoDraw(wxDC *dc);
// draw the caret on the given DC
void DoDraw(wxDC *dc);
@@
-51,18
+70,15
@@
private:
// GTK specific initialization
void InitGeneric();
// GTK specific initialization
void InitGeneric();
- class CaretTimer : public wxTimer
- {
- public:
- CaretTimer(wxCaret *caret) { m_caret = caret; }
-
- virtual void Notify() { m_caret->Blink(); }
-
- private:
- wxCaret *m_caret;
- } m_timer;
+ // the bitmap holding the part of window hidden by the caret when it was
+ // at (m_xOld, m_yOld)
+ wxBitmap m_bmpUnderCaret;
+ int m_xOld,
+ m_yOld;
- bool m_blinkedOut; // TRUE => caret hidden right now
+ wxCaretTimer m_timer;
+ bool m_blinkedOut, // true => caret hidden right now
+ m_hasFocus; // true => our window has focus
};
#endif // _WX_CARET_H_
};
#endif // _WX_CARET_H_