use wxOVERRIDE in wxMSW sources
This commit is contained in:
Paul Cornett
@@ -43,58 +43,58 @@ public:
|
||||
// overridden wxTextEntry methods
|
||||
// ------------------------------
|
||||
|
||||
virtual wxString GetValue() const;
|
||||
virtual wxString GetRange(long from, long to) const;
|
||||
virtual wxString GetValue() const wxOVERRIDE;
|
||||
virtual wxString GetRange(long from, long to) const wxOVERRIDE;
|
||||
|
||||
virtual bool IsEmpty() const;
|
||||
|
||||
virtual void WriteText(const wxString& text);
|
||||
virtual void AppendText(const wxString& text);
|
||||
virtual void Clear();
|
||||
virtual void WriteText(const wxString& text) wxOVERRIDE;
|
||||
virtual void AppendText(const wxString& text) wxOVERRIDE;
|
||||
virtual void Clear() wxOVERRIDE;
|
||||
|
||||
virtual int GetLineLength(long lineNo) const;
|
||||
virtual wxString GetLineText(long lineNo) const;
|
||||
virtual int GetNumberOfLines() const;
|
||||
virtual int GetLineLength(long lineNo) const wxOVERRIDE;
|
||||
virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
|
||||
virtual int GetNumberOfLines() const wxOVERRIDE;
|
||||
|
||||
virtual void SetMaxLength(unsigned long len);
|
||||
virtual void SetMaxLength(unsigned long len) wxOVERRIDE;
|
||||
|
||||
virtual void GetSelection(long *from, long *to) const;
|
||||
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
|
||||
|
||||
virtual void Redo();
|
||||
virtual bool CanRedo() const;
|
||||
virtual void Redo() wxOVERRIDE;
|
||||
virtual bool CanRedo() const wxOVERRIDE;
|
||||
|
||||
virtual void SetInsertionPointEnd();
|
||||
virtual long GetInsertionPoint() const;
|
||||
virtual wxTextPos GetLastPosition() const;
|
||||
virtual void SetInsertionPointEnd() wxOVERRIDE;
|
||||
virtual long GetInsertionPoint() const wxOVERRIDE;
|
||||
virtual wxTextPos GetLastPosition() const wxOVERRIDE;
|
||||
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
||||
virtual bool IsModified() const;
|
||||
virtual void MarkDirty();
|
||||
virtual void DiscardEdits();
|
||||
virtual bool IsModified() const wxOVERRIDE;
|
||||
virtual void MarkDirty() wxOVERRIDE;
|
||||
virtual void DiscardEdits() wxOVERRIDE;
|
||||
|
||||
virtual bool EmulateKeyPress(const wxKeyEvent& event);
|
||||
virtual bool EmulateKeyPress(const wxKeyEvent& event) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_RICHEDIT
|
||||
// apply text attribute to the range of text (only works with richedit
|
||||
// controls)
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style);
|
||||
virtual bool SetDefaultStyle(const wxTextAttr& style);
|
||||
virtual bool GetStyle(long position, wxTextAttr& style);
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
|
||||
#endif // wxUSE_RICHEDIT
|
||||
|
||||
// translate between the position (which is just an index in the text ctrl
|
||||
// considering all its contents as a single strings) and (x, y) coordinates
|
||||
// which represent column and line.
|
||||
virtual long XYToPosition(long x, long y) const;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const;
|
||||
virtual long XYToPosition(long x, long y) const wxOVERRIDE;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
|
||||
|
||||
virtual void ShowPosition(long pos);
|
||||
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
|
||||
virtual void ShowPosition(long pos) wxOVERRIDE;
|
||||
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE;
|
||||
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
|
||||
wxTextCoord *col,
|
||||
wxTextCoord *row) const
|
||||
wxTextCoord *row) const wxOVERRIDE
|
||||
{
|
||||
return wxTextCtrlBase::HitTest(pt, col, row);
|
||||
}
|
||||
@@ -110,26 +110,26 @@ public:
|
||||
// --------------------------
|
||||
|
||||
#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
||||
virtual void SetDropTarget(wxDropTarget *dropTarget);
|
||||
virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE;
|
||||
#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
||||
|
||||
virtual void SetWindowStyleFlag(long style);
|
||||
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd);
|
||||
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_RICHEDIT
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
|
||||
int GetRichVersion() const { return m_verRichEdit; }
|
||||
bool IsRich() const { return m_verRichEdit != 0; }
|
||||
|
||||
// rich edit controls are not compatible with normal ones and we must set
|
||||
// the colours and font for them otherwise
|
||||
virtual bool SetBackgroundColour(const wxColour& colour);
|
||||
virtual bool SetForegroundColour(const wxColour& colour);
|
||||
virtual bool SetFont(const wxFont& font);
|
||||
virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
|
||||
#else
|
||||
bool IsRich() const { return false; }
|
||||
#endif // wxUSE_RICHEDIT
|
||||
@@ -140,12 +140,12 @@ public:
|
||||
bool IsInkEdit() const { return false; }
|
||||
#endif
|
||||
|
||||
virtual void AdoptAttributesFromHWND();
|
||||
virtual void AdoptAttributesFromHWND() wxOVERRIDE;
|
||||
|
||||
virtual bool AcceptsFocusFromKeyboard() const;
|
||||
virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE;
|
||||
|
||||
// returns true if the platform should explicitly apply a theme border
|
||||
virtual bool CanApplyThemeBorder() const;
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE;
|
||||
|
||||
// callbacks
|
||||
void OnDropFiles(wxDropFilesEvent& event);
|
||||
@@ -184,10 +184,10 @@ public:
|
||||
virtual bool MSWHandleMessage(WXLRESULT *result,
|
||||
WXUINT message,
|
||||
WXWPARAM wParam,
|
||||
WXLPARAM lParam);
|
||||
WXLPARAM lParam) wxOVERRIDE;
|
||||
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg) wxOVERRIDE;
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
@@ -202,9 +202,9 @@ protected:
|
||||
const wxPoint& pos,
|
||||
const wxSize& size);
|
||||
|
||||
virtual void DoSetValue(const wxString &value, int flags = 0);
|
||||
virtual void DoSetValue(const wxString &value, int flags = 0) wxOVERRIDE;
|
||||
|
||||
virtual wxPoint DoPositionToCoords(long pos) const;
|
||||
virtual wxPoint DoPositionToCoords(long pos) const wxOVERRIDE;
|
||||
|
||||
// return true if this control has a user-set limit on amount of text (i.e.
|
||||
// the limit is due to a previous call to SetMaxLength() and not built in)
|
||||
@@ -225,7 +225,7 @@ protected:
|
||||
int flags = SetValue_SendEvent | SetValue_SelectionOnly);
|
||||
|
||||
// set the selection (possibly without scrolling the caret into view)
|
||||
void DoSetSelection(long from, long to, int flags);
|
||||
void DoSetSelection(long from, long to, int flags) wxOVERRIDE;
|
||||
|
||||
// get the length of the line containing the character at the given
|
||||
// position
|
||||
@@ -234,8 +234,8 @@ protected:
|
||||
// send TEXT_UPDATED event, return true if it was handled, false otherwise
|
||||
bool SendUpdateEvent();
|
||||
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
|
||||
|
||||
#if wxUSE_RICHEDIT
|
||||
// Apply the character-related parts of wxTextAttr to the given selection
|
||||
@@ -266,14 +266,14 @@ protected:
|
||||
int m_updatesCount;
|
||||
|
||||
private:
|
||||
virtual void EnableTextChangedEvents(bool enable)
|
||||
virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE
|
||||
{
|
||||
m_updatesCount = enable ? -1 : -2;
|
||||
}
|
||||
|
||||
// implement wxTextEntry pure virtual: it implements all the operations for
|
||||
// the simple EDIT controls
|
||||
virtual WXHWND GetEditHWND() const { return m_hWnd; }
|
||||
virtual WXHWND GetEditHWND() const wxOVERRIDE { return m_hWnd; }
|
||||
|
||||
void OnKeyDown(wxKeyEvent& event);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user