solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Don't use wxOVERRIDE in generated wxSTC files

Browse source 
This should have been done together with 88d526660f (Replace wxOVERRIDE
and wxNOEXCEPT with override and noexcept, 2022-10-12).
This commit is contained in:
Vadim Zeitlin 2022-10-18 00:28:19 +02:00
parent bc07c9a309
commit 59cb83ea17
2 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/stc/gen_iface.py
View file

@ -122,7 +122,7 @@ methodOverrideMap = {
),
'AppendText' : (0,
'void %s(const wxString& text) wxOVERRIDE;',
'void %s(const wxString& text) override;',
'''void %s(const wxString& text) {
const wxWX2MBbuf buf = wx2stc(text);
@ -1083,7 +1083,7 @@ constNonGetterMethods = (
'CanUndo',
)
# several methods require wxOVERRIDE
# several methods require override
overrideNeeded = (
'Redo',
'SelectAll',
@ -1272,7 +1272,7 @@ def processMethods(methods):
if is_const:
theDef = theDef + ' const'
if is_override:
theDef = theDef + ' wxOVERRIDE'
theDef = theDef + ' override'
theDef = theDef + ';'
if category=='DeprecatedMessages' or icat=='Deprecated':
defs.append(' wxDEPRECATED_MSG( "This method uses a function '
@ -1281,7 +1281,7 @@ def processMethods(methods):
# Skip override from the interface file
if is_override:
theDef = theDef.replace(' wxOVERRIDE', '')
theDef = theDef.replace(' override', '')
# Build the method definition for the interface .h file
intrflines = []

66
src/stc/stc.h.in
View file

@ -372,16 +372,16 @@ public:
// implement wxTextEntryBase pure virtual methods
// ----------------------------------------------
virtual void WriteText(const wxString& text) wxOVERRIDE
virtual void WriteText(const wxString& text) override
{
ReplaceSelection(text);
}
virtual void Remove(long from, long to) wxOVERRIDE
virtual void Remove(long from, long to) override
{
Replace(from, to, wxString());
}
virtual void Replace(long from, long to, const wxString& text) wxOVERRIDE
virtual void Replace(long from, long to, const wxString& text) override
{
SetTargetStart((int)from);
SetTargetEnd((int)to);
@ -403,14 +403,14 @@ public:
*/
virtual void SetInsertionPoint(long pos) wxOVERRIDE
virtual void SetInsertionPoint(long pos) override
{
SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos));
}
virtual long GetInsertionPoint() const wxOVERRIDE { return GetCurrentPos(); }
virtual long GetLastPosition() const wxOVERRIDE { return GetTextLength(); }
virtual long GetInsertionPoint() const override { return GetCurrentPos(); }
virtual long GetLastPosition() const override { return GetTextLength(); }
virtual void SetSelection(long from, long to) wxOVERRIDE
virtual void SetSelection(long from, long to) override
{
if ( from == -1 && to == -1 )
{
@ -423,7 +423,7 @@ public:
}
}
virtual void SelectNone() wxOVERRIDE
virtual void SelectNone() override
{
ClearSelections();
}
@ -431,7 +431,7 @@ public:
#ifdef SWIG
void GetSelection(long* OUTPUT, long* OUTPUT) const;
#else
virtual void GetSelection(long *from, long *to) const wxOVERRIDE
virtual void GetSelection(long *from, long *to) const override
{
if ( from )
*from = GetSelectionStart();
@ -451,13 +451,13 @@ public:
}
#endif
virtual bool IsEditable() const wxOVERRIDE { return !GetReadOnly(); }
virtual void SetEditable(bool editable) wxOVERRIDE { SetReadOnly(!editable); }
virtual bool IsEditable() const override { return !GetReadOnly(); }
virtual void SetEditable(bool editable) override { SetReadOnly(!editable); }
// implement wxTextAreaBase pure virtual methods
// ---------------------------------------------
virtual int GetLineLength(long lineNo) const wxOVERRIDE
virtual int GetLineLength(long lineNo) const override
{
if ( lineNo < 0 || lineNo >= GetNumberOfLines() )
return -1;
@ -465,7 +465,7 @@ public:
return static_cast<int>(GetLineText(lineNo).length());
}
virtual wxString GetLineText(long lineNo) const wxOVERRIDE
virtual wxString GetLineText(long lineNo) const override
{
wxString text = GetLine(static_cast<int>(lineNo));
size_t lastNewLine = text.find_last_not_of(wxS("\r\n"));
@ -476,35 +476,35 @@ public:
text.clear();
return text;
}
virtual int GetNumberOfLines() const wxOVERRIDE { return GetLineCount(); }
virtual int GetNumberOfLines() const override { return GetLineCount(); }
virtual bool IsModified() const wxOVERRIDE { return GetModify(); }
virtual void MarkDirty() wxOVERRIDE { wxFAIL_MSG("not implemented"); }
virtual void DiscardEdits() wxOVERRIDE { SetSavePoint(); }
virtual bool IsModified() const override { return GetModify(); }
virtual void MarkDirty() override { wxFAIL_MSG("not implemented"); }
virtual void DiscardEdits() override { SetSavePoint(); }
virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end),
const wxTextAttr& WXUNUSED(style)) wxOVERRIDE
const wxTextAttr& WXUNUSED(style)) override
{
wxFAIL_MSG("not implemented");
return false;
}
virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) wxOVERRIDE
virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) override
{
wxFAIL_MSG("not implemented");
return false;
}
virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) wxOVERRIDE
virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) override
{
wxFAIL_MSG("not implemented");
return false;
}
virtual long XYToPosition(long x, long y) const wxOVERRIDE
virtual long XYToPosition(long x, long y) const override
{
long pos = PositionFromLine((int)y);
if ( pos == -1 )
@ -517,7 +517,7 @@ public:
return pos;
}
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE
virtual bool PositionToXY(long pos, long *x, long *y) const override
{
int l = LineFromPosition((int)pos);
if ( l == -1 )
@ -536,11 +536,11 @@ public:
return true;
}
virtual void ShowPosition(long pos) wxOVERRIDE { GotoPos((int)pos); }
virtual void ShowPosition(long pos) override { GotoPos((int)pos); }
using wxWindow::HitTest;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override
{
const long l = PositionFromPoint(pt);
if ( l == -1 )
@ -555,7 +555,7 @@ public:
// just unhide it
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
wxTextCoord *col,
wxTextCoord *row) const wxOVERRIDE
wxTextCoord *row) const override
{
return wxTextAreaBase::HitTest(pt, col, row);
}
@ -573,13 +573,13 @@ public:
static wxVersionInfo GetLibraryVersionInfo();
protected:
virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE;
virtual wxString DoGetValue() const wxOVERRIDE { return GetText(); }
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
virtual void DoSetValue(const wxString& value, int flags) override;
virtual wxString DoGetValue() const override { return GetText(); }
virtual wxWindow *GetEditableWindow() override { return this; }
#ifndef SWIG
virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE;
virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE;
virtual bool DoLoadFile(const wxString& file, int fileType) override;
virtual bool DoSaveFile(const wxString& file, int fileType) override;
// Event handlers
void OnPaint(wxPaintEvent& evt);
@ -605,14 +605,14 @@ protected:
void OnIdle(wxIdleEvent& evt);
void OnMouseCaptureLost(wxMouseCaptureLostEvent& evt);
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxSize DoGetBestSize() const override;
// Turn notifications from Scintilla into events
void NotifyChange();
void NotifyParent(SCNotification* scn);
#ifdef __WXMSW__
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override;
#endif // __WXMSW__
private:
@ -718,7 +718,7 @@ public:
bool GetControl() const;
bool GetAlt() const;
virtual wxEvent* Clone() const wxOVERRIDE { return new wxStyledTextEvent(*this); }
virtual wxEvent* Clone() const override { return new wxStyledTextEvent(*this); }
#ifndef SWIG
private: