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

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
include/wx/univ/textctrl.h
View File

@@ -103,39 +103,39 @@ public:
// implement base class pure virtuals
// ----------------------------------
virtual int GetLineLength(wxTextCoord lineNo) const;
virtual wxString GetLineText(wxTextCoord lineNo) const;
virtual int GetNumberOfLines() const;
virtual int GetLineLength(wxTextCoord lineNo) const wxOVERRIDE;
virtual wxString GetLineText(wxTextCoord lineNo) const wxOVERRIDE;
virtual int GetNumberOfLines() const wxOVERRIDE;
virtual bool IsModified() const;
virtual bool IsEditable() const;
virtual bool IsModified() const wxOVERRIDE;
virtual bool IsEditable() const wxOVERRIDE;
// If the return values from and to are the same, there is no selection.
virtual void GetSelection(wxTextPos* from, wxTextPos* to) const;
virtual void GetSelection(wxTextPos* from, wxTextPos* to) const wxOVERRIDE;
// operations
// ----------
// editing
virtual void Clear();
virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value);
virtual void Remove(wxTextPos from, wxTextPos to);
virtual void Clear() wxOVERRIDE;
virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value) wxOVERRIDE;
virtual void Remove(wxTextPos from, wxTextPos to) wxOVERRIDE;
// sets/clears the dirty flag
virtual void MarkDirty();
virtual void DiscardEdits();
virtual void MarkDirty() wxOVERRIDE;
virtual void DiscardEdits() wxOVERRIDE;
// writing text inserts it at the current position, appending always
// inserts it at the end
virtual void WriteText(const wxString& text);
virtual void AppendText(const wxString& text);
virtual void WriteText(const wxString& text) wxOVERRIDE;
virtual void AppendText(const wxString& text) wxOVERRIDE;
// 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 (logical, i.e. unwrapped) column and line.
virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const;
virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const wxOVERRIDE;
virtual bool PositionToXY(wxTextPos pos,
wxTextCoord *x, wxTextCoord *y) const;
wxTextCoord *x, wxTextCoord *y) const wxOVERRIDE;
// wxUniv-specific: find a screen position (in client coordinates) of the
// given text position or of the caret
@@ -143,28 +143,28 @@ public:
bool PositionToDeviceXY(wxTextPos pos, wxCoord *x, wxCoord *y) const;
wxPoint GetCaretPosition() const;
virtual void ShowPosition(wxTextPos pos);
virtual void ShowPosition(wxTextPos pos) wxOVERRIDE;
// Clipboard operations
virtual void Copy();
virtual void Cut();
virtual void Paste();
virtual void Copy() wxOVERRIDE;
virtual void Cut() wxOVERRIDE;
virtual void Paste() wxOVERRIDE;
// Undo/redo
virtual void Undo();
virtual void Redo();
virtual void Undo() wxOVERRIDE;
virtual void Redo() wxOVERRIDE;
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual bool CanUndo() const wxOVERRIDE;
virtual bool CanRedo() const wxOVERRIDE;
// Insertion point
virtual void SetInsertionPoint(wxTextPos pos);
virtual void SetInsertionPointEnd();
virtual wxTextPos GetInsertionPoint() const;
virtual wxTextPos GetLastPosition() const;
virtual void SetInsertionPoint(wxTextPos pos) wxOVERRIDE;
virtual void SetInsertionPointEnd() wxOVERRIDE;
virtual wxTextPos GetInsertionPoint() const wxOVERRIDE;
virtual wxTextPos GetLastPosition() const wxOVERRIDE;
virtual void SetSelection(wxTextPos from, wxTextPos to);
virtual void SetEditable(bool editable);
virtual void SetSelection(wxTextPos from, wxTextPos to) wxOVERRIDE;
virtual void SetEditable(bool editable) wxOVERRIDE;
// wxUniv-specific methods
// -----------------------
@@ -185,10 +185,10 @@ public:
void RemoveSelection();
wxString GetSelectionText() const;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
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;
// find the character at this position in the given line, return value as
// for HitTest()
@@ -206,7 +206,7 @@ public:
void ScrollText(wxTextCoord col);
// adjust the DC for horz text control scrolling too
virtual void DoPrepareDC(wxDC& dc);
virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE;
// implementation only from now on
// -------------------------------
@@ -218,17 +218,17 @@ public:
// perform an action
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
// override these methods to handle the caret
virtual bool SetFont(const wxFont &font);
virtual bool Enable(bool enable = true);
virtual bool SetFont(const wxFont &font) wxOVERRIDE;
virtual bool Enable(bool enable = true) wxOVERRIDE;
// more readable flag testing methods
bool IsPassword() const { return HasFlag(wxTE_PASSWORD); }
@@ -239,25 +239,25 @@ public:
// override wxScrollHelper method to prevent (auto)scrolling beyond the end
// of line
virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const;
virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const wxOVERRIDE;
// idle processing
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
protected:
// ensure we have correct default border
virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_SUNKEN; }
// override base class methods
virtual void DoDrawBorder(wxDC& dc, const wxRect& rect);
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDrawBorder(wxDC& dc, const wxRect& rect) wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
// calc the size from the text extent
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// implements Set/ChangeValue()
virtual void DoSetValue(const wxString& value, int flags = 0);
virtual wxString DoGetValue() const;
virtual void DoSetValue(const wxString& value, int flags = 0) wxOVERRIDE;
virtual wxString DoGetValue() const wxOVERRIDE;
// common part of all ctors
void Init();