projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
define WINVER as 0x0400 for VC++ 6 because its headers give a warning if WINVER ...
[wxWidgets.git]
/
include
/
wx
/
msw
/
textctrl.h
diff --git
a/include/wx/msw/textctrl.h
b/include/wx/msw/textctrl.h
index 2c66ed228e1ef75a2eb4aabe74ca4bd73a7fa354..e3b5fc68ad8506b3875b253a748d64c29a407ded 100644
(file)
--- a/
include/wx/msw/textctrl.h
+++ b/
include/wx/msw/textctrl.h
@@
-74,6
+74,7
@@
public:
virtual bool LoadFile(const wxString& file);
// clears the dirty flag
virtual bool LoadFile(const wxString& file);
// clears the dirty flag
+ virtual void MarkDirty();
virtual void DiscardEdits();
virtual void SetMaxLength(unsigned long len);
virtual void DiscardEdits();
virtual void SetMaxLength(unsigned long len);
@@
-102,6
+103,13
@@
public:
virtual bool PositionToXY(long pos, long *x, long *y) const;
virtual void ShowPosition(long pos);
virtual bool PositionToXY(long pos, long *x, long *y) const;
virtual void ShowPosition(long pos);
+ virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
+ virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
+ wxTextCoord *col,
+ wxTextCoord *row) const
+ {
+ return wxTextCtrlBase::HitTest(pt, col, row);
+ }
// Clipboard operations
virtual void Copy();
// Clipboard operations
virtual void Copy();
@@
-143,12
+151,6
@@
public:
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
- // In WIN16, need to override normal erasing because
- // Ctl3D doesn't use the wxWindows background colour.
-#ifdef __WIN16__
- void OnEraseBackground(wxEraseEvent& event);
-#endif
-
#if wxUSE_RICHEDIT
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
#if wxUSE_RICHEDIT
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
@@
-198,7
+200,7
@@
protected:
void Init();
// intercept WM_GETDLGCODE
void Init();
// intercept WM_GETDLGCODE
- virtual
long
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+ virtual
WXLRESULT
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
// call this to increase the size limit (will do nothing if the current
// limit is big enough)
// call this to increase the size limit (will do nothing if the current
// limit is big enough)
@@
-218,10
+220,10
@@
protected:
// replace the contents of the selection or of the entire control with the
// given text
// replace the contents of the selection or of the entire control with the
// given text
- void DoWriteText(const wxString& text, bool selectionOnly =
TRUE
);
+ void DoWriteText(const wxString& text, bool selectionOnly =
true
);
// set the selection possibly without scrolling the caret into view
// set the selection possibly without scrolling the caret into view
- void DoSetSelection(long from, long to, bool scrollCaret =
TRUE
);
+ void DoSetSelection(long from, long to, bool scrollCaret =
true
);
// return true if there is a non empty selection in the control
bool HasSelection() const;
// return true if there is a non empty selection in the control
bool HasSelection() const;
@@
-230,7
+232,7
@@
protected:
// position
long GetLengthOfLineContainingPos(long pos) const;
// position
long GetLengthOfLineContainingPos(long pos) const;
- // send TEXT_UPDATED event, return
TRUE if it was handled, FALSE
otherwise
+ // send TEXT_UPDATED event, return
true if it was handled, false
otherwise
bool SendUpdateEvent();
// override some base class virtuals
bool SendUpdateEvent();
// override some base class virtuals
@@
-246,7
+248,7
@@
protected:
int m_verRichEdit;
#endif // wxUSE_RICHEDIT
int m_verRichEdit;
#endif // wxUSE_RICHEDIT
- // if
TRUE
, SendUpdateEvent() will eat the next event (see comments in the
+ // if
true
, SendUpdateEvent() will eat the next event (see comments in the
// code as to why this is needed)
bool m_suppressNextUpdate;
// code as to why this is needed)
bool m_suppressNextUpdate;