Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxOVERRIDE to ScintillaWX virtual functions

Browse Source
This commit is contained in:
ARATA Mizuki
2015-01-10 19:06:32 +09:00
committed by Vadim Zeitlin
parent 095cf87eb6
commit b23c6512b6
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/stc/ScintillaWX.h
View File

@@ -113,38 +113,38 @@ public:
~ScintillaWX(); ~ScintillaWX();
// base class virtuals // base class virtuals
virtual void Initialise(); virtual void Initialise() wxOVERRIDE;
virtual void Finalise(); virtual void Finalise() wxOVERRIDE;
virtual void StartDrag(); virtual void StartDrag() wxOVERRIDE;
virtual bool SetIdle(bool on); virtual bool SetIdle(bool on) wxOVERRIDE;
virtual void SetTicking(bool on); virtual void SetTicking(bool on) wxOVERRIDE;
virtual void SetMouseCapture(bool on); virtual void SetMouseCapture(bool on) wxOVERRIDE;
virtual bool HaveMouseCapture(); virtual bool HaveMouseCapture() wxOVERRIDE;
virtual void ScrollText(int linesToMove); virtual void ScrollText(int linesToMove) wxOVERRIDE;
virtual void SetVerticalScrollPos(); virtual void SetVerticalScrollPos() wxOVERRIDE;
virtual void SetHorizontalScrollPos(); virtual void SetHorizontalScrollPos() wxOVERRIDE;
virtual bool ModifyScrollBars(int nMax, int nPage); virtual bool ModifyScrollBars(int nMax, int nPage) wxOVERRIDE;
virtual void Copy(); virtual void Copy() wxOVERRIDE;
virtual void Paste(); virtual void Paste() wxOVERRIDE;
virtual void CopyToClipboard(const SelectionText &selectedText); virtual void CopyToClipboard(const SelectionText &selectedText) wxOVERRIDE;
virtual void CreateCallTipWindow(PRectangle rc); virtual void CreateCallTipWindow(PRectangle rc) wxOVERRIDE;
virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) wxOVERRIDE;
virtual void ClaimSelection(); virtual void ClaimSelection() wxOVERRIDE;
virtual sptr_t DefWndProc(unsigned int iMessage, virtual sptr_t DefWndProc(unsigned int iMessage,
uptr_t wParam, uptr_t wParam,
sptr_t lParam); sptr_t lParam) wxOVERRIDE;
virtual sptr_t WndProc(unsigned int iMessage, virtual sptr_t WndProc(unsigned int iMessage,
uptr_t wParam, uptr_t wParam,
sptr_t lParam); sptr_t lParam) wxOVERRIDE;
virtual void NotifyChange(); virtual void NotifyChange() wxOVERRIDE;
virtual void NotifyParent(SCNotification scn); virtual void NotifyParent(SCNotification scn) wxOVERRIDE;
virtual void CancelModes(); virtual void CancelModes() wxOVERRIDE;
virtual void UpdateSystemCaret(); virtual void UpdateSystemCaret() wxOVERRIDE;
// Event delegates // Event delegates
void DoPaint(wxDC* dc, wxRect rect); void DoPaint(wxDC* dc, wxRect rect);