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

Addition of overrides in diverse headers

Browse Source
This commit is contained in:
Hartwig
2015-11-22 10:16:01 +01:00
parent 308de8b69d
commit 474461601f
7 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
include/wx/stc/stc.h
View File

@@ -2794,14 +2794,14 @@ public:
int GetStyleAt(int pos) const;
// Redoes the next action on the undo history.
void Redo();
void Redo() wxOVERRIDE;
// Choose between collecting actions into the undo
// history and discarding them.
void SetUndoCollection(bool collectUndo);
// Select all the text in the document.
void SelectAll();
void SelectAll() wxOVERRIDE;
// Remember the current position in the undo history as the position
// at which the document was saved.
@@ -2811,7 +2811,7 @@ public:
wxMemoryBuffer GetStyledText(int startPos, int endPos);
// Are there any redoable actions in the undo history?
bool CanRedo() const;
bool CanRedo() const wxOVERRIDE;
// Retrieve the line number at which a particular marker is located.
int MarkerLineFromHandle(int handle);
@@ -3462,28 +3462,28 @@ public:
void SetReadOnly(bool readOnly);
// Will a paste succeed?
bool CanPaste() const;
bool CanPaste() const wxOVERRIDE;
// Are there any undoable actions in the undo history?
bool CanUndo() const;
bool CanUndo() const wxOVERRIDE;
// Delete the undo history.
void EmptyUndoBuffer();
// Undo one action in the undo history.
void Undo();
void Undo() wxOVERRIDE;
// Cut the selection to the clipboard.
void Cut();
void Cut() wxOVERRIDE;
// Copy the selection to the clipboard.
void Copy();
void Copy() wxOVERRIDE;
// Paste the contents of the clipboard into the document replacing the selection.
void Paste();
void Paste() wxOVERRIDE;
// Clear the selection.
void Clear();
void Clear() wxOVERRIDE;
// Replace the contents of the document with the argument text.
void SetText(const wxString& text);
@@ -3751,7 +3751,7 @@ public:
bool GetUseVerticalScrollBar() const;
// Append a string to the end of the document without changing the selection.
void AppendText(const wxString& text);
void AppendText(const wxString& text) wxOVERRIDE;
// Is drawing done in two phases with backgrounds drawn before foregrounds?
bool GetTwoPhaseDraw() const;
@@ -4957,16 +4957,16 @@ public:
// implement wxTextEntryBase pure virtual methods
// ----------------------------------------------
virtual void WriteText(const wxString& text)
virtual void WriteText(const wxString& text) wxOVERRIDE
{
ReplaceSelection(text);
}
virtual void Remove(long from, long to)
virtual void Remove(long from, long to) wxOVERRIDE
{
Replace(from, to, "");
}
virtual void Replace(long from, long to, const wxString& text)
virtual void Replace(long from, long to, const wxString& text) wxOVERRIDE
{
SetTargetStart((int)from);
SetTargetEnd((int)to);
@@ -4988,14 +4988,14 @@ public:
*/
virtual void SetInsertionPoint(long pos)
virtual void SetInsertionPoint(long pos) wxOVERRIDE
{
SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos));
}
virtual long GetInsertionPoint() const { return GetCurrentPos(); }
virtual long GetLastPosition() const { return GetTextLength(); }
virtual long GetInsertionPoint() const wxOVERRIDE { return GetCurrentPos(); }
virtual long GetLastPosition() const wxOVERRIDE { return GetTextLength(); }
virtual void SetSelection(long from, long to)
virtual void SetSelection(long from, long to) wxOVERRIDE
{
if ( from == -1 && to == -1 )
{
@@ -5008,7 +5008,7 @@ public:
}
}
virtual void SelectNone()
virtual void SelectNone() wxOVERRIDE
{
ClearSelections();
}
@@ -5016,7 +5016,7 @@ public:
#ifdef SWIG
void GetSelection(long* OUTPUT, long* OUTPUT) const;
#else
virtual void GetSelection(long *from, long *to) const
virtual void GetSelection(long *from, long *to) const wxOVERRIDE
{
if ( from )
*from = GetSelectionStart();
@@ -5036,14 +5036,14 @@ public:
}
#endif
virtual bool IsEditable() const { return !GetReadOnly(); }
virtual void SetEditable(bool editable) { SetReadOnly(!editable); }
virtual bool IsEditable() const wxOVERRIDE { return !GetReadOnly(); }
virtual void SetEditable(bool editable) wxOVERRIDE { SetReadOnly(!editable); }
// implement wxTextAreaBase pure virtual methods
// ---------------------------------------------
virtual int GetLineLength(long lineNo) const { return static_cast<int>(GetLineText(lineNo).length()); }
virtual wxString GetLineText(long lineNo) const
virtual int GetLineLength(long lineNo) const wxOVERRIDE { return static_cast<int>(GetLineText(lineNo).length()); }
virtual wxString GetLineText(long lineNo) const wxOVERRIDE
{
wxString text = GetLine(static_cast<int>(lineNo));
size_t lastNewLine = text.find_last_not_of(wxS("\r\n"));
@@ -5054,42 +5054,42 @@ public:
text.clear();
return text;
}
virtual int GetNumberOfLines() const { return GetLineCount(); }
virtual int GetNumberOfLines() const wxOVERRIDE { return GetLineCount(); }
virtual bool IsModified() const { return GetModify(); }
virtual void MarkDirty() { wxFAIL_MSG("not implemented"); }
virtual void DiscardEdits() { SetSavePoint(); }
virtual bool IsModified() const wxOVERRIDE { return GetModify(); }
virtual void MarkDirty() wxOVERRIDE { wxFAIL_MSG("not implemented"); }
virtual void DiscardEdits() wxOVERRIDE { SetSavePoint(); }
virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end),
const wxTextAttr& WXUNUSED(style))
const wxTextAttr& WXUNUSED(style)) wxOVERRIDE
{
wxFAIL_MSG("not implemented");
return false;
}
virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) wxOVERRIDE
{
wxFAIL_MSG("not implemented");
return false;
}
virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style))
virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) wxOVERRIDE
{
wxFAIL_MSG("not implemented");
return false;
}
virtual long XYToPosition(long x, long y) const
virtual long XYToPosition(long x, long y) const wxOVERRIDE
{
long pos = PositionFromLine((int)y);
pos += x;
return pos;
}
virtual bool PositionToXY(long pos, long *x, long *y) const
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE
{
int l = LineFromPosition((int)pos);
if ( l == -1 )
@@ -5104,11 +5104,11 @@ public:
return true;
}
virtual void ShowPosition(long pos) { GotoPos((int)pos); }
virtual void ShowPosition(long pos) wxOVERRIDE { GotoPos((int)pos); }
using wxWindow::HitTest;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE
{
const long l = PositionFromPoint(pt);
if ( l == -1 )
@@ -5123,7 +5123,7 @@ public:
// just unhide it
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
wxTextCoord *col,
wxTextCoord *row) const
wxTextCoord *row) const wxOVERRIDE
{
return wxTextAreaBase::HitTest(pt, col, row);
}
@@ -5131,13 +5131,13 @@ public:
static wxVersionInfo GetLibraryVersionInfo();
protected:
virtual void DoSetValue(const wxString& value, int flags);
virtual wxString DoGetValue() const { return GetText(); }
virtual wxWindow *GetEditableWindow() { return this; }
virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE;
virtual wxString DoGetValue() const wxOVERRIDE { return GetText(); }
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
#ifndef SWIG
virtual bool DoLoadFile(const wxString& file, int fileType);
virtual bool DoSaveFile(const wxString& file, int fileType);
virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE;
virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE;
// Event handlers
void OnPaint(wxPaintEvent& evt);
@@ -5161,7 +5161,7 @@ protected:
void OnListBox(wxCommandEvent& evt);
void OnIdle(wxIdleEvent& evt);
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
// Turn notifications from Scintilla into events
void NotifyChange();