projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version number bump
[wxWidgets.git]
/
include
/
wx
/
generic
/
caret.h
diff --git
a/include/wx/generic/caret.h
b/include/wx/generic/caret.h
index 73dcaa463912eec1f1579376e27abaa226b37e5c..96677b46d13a34e560567a22bc1390594c5f00cf 100644
(file)
--- a/
include/wx/generic/caret.h
+++ b/
include/wx/generic/caret.h
@@
-5,14
+5,14
@@
// 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
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CARET_H_
#define _WX_CARET_H_
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CARET_H_
#define _WX_CARET_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "caret.h"
#endif
#pragma interface "caret.h"
#endif
@@
-59,6
+59,7
@@
protected:
virtual void DoShow();
virtual void DoHide();
virtual void DoMove();
virtual void DoShow();
virtual void DoHide();
virtual void DoMove();
+ virtual void DoSize();
// blink the caret once
void Blink();
// blink the caret once
void Blink();
@@
-68,7
+69,7
@@
protected:
// draw the caret on the given DC
void DoDraw(wxDC *dc);
// draw the caret on the given DC
void DoDraw(wxDC *dc);
-
+
private:
// GTK specific initialization
void InitGeneric();
private:
// GTK specific initialization
void InitGeneric();
@@
-80,8
+81,8
@@
private:
m_yOld;
wxCaretTimer m_timer;
m_yOld;
wxCaretTimer m_timer;
- bool m_blinkedOut, //
TRUE
=> caret hidden right now
- m_hasFocus; //
TRUE
=> our window has focus
+ bool m_blinkedOut, //
true
=> caret hidden right now
+ m_hasFocus; //
true
=> our window has focus
};
#endif // _WX_CARET_H_
};
#endif // _WX_CARET_H_