Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
parent
be5095acdd
commit
88d526660f
1282 changed files with 11878 additions and 11878 deletions
|
|
@ -35,41 +35,41 @@ public:
|
|||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
|
||||
|
||||
virtual int GetLineLength(long lineNo) const wxOVERRIDE;
|
||||
virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
|
||||
virtual int GetNumberOfLines() const wxOVERRIDE;
|
||||
virtual int GetLineLength(long lineNo) const override;
|
||||
virtual wxString GetLineText(long lineNo) const override;
|
||||
virtual int GetNumberOfLines() const override;
|
||||
|
||||
virtual bool IsModified() const wxOVERRIDE;
|
||||
virtual void MarkDirty() wxOVERRIDE;
|
||||
virtual void DiscardEdits() wxOVERRIDE;
|
||||
virtual bool IsModified() const override;
|
||||
virtual void MarkDirty() override;
|
||||
virtual void DiscardEdits() override;
|
||||
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style) override;
|
||||
virtual bool GetStyle(long position, wxTextAttr& style) override;
|
||||
virtual bool SetDefaultStyle(const wxTextAttr& style) override;
|
||||
|
||||
virtual long XYToPosition(long x, long y) const wxOVERRIDE;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
|
||||
virtual long XYToPosition(long x, long y) const override;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const override;
|
||||
|
||||
virtual void ShowPosition(long pos) wxOVERRIDE;
|
||||
virtual void ShowPosition(long pos) override;
|
||||
|
||||
virtual void SetInsertionPoint(long pos) wxOVERRIDE;
|
||||
virtual long GetInsertionPoint() const wxOVERRIDE;
|
||||
virtual void SetSelection( long from, long to ) wxOVERRIDE;
|
||||
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
|
||||
virtual void SetInsertionPoint(long pos) override;
|
||||
virtual long GetInsertionPoint() const override;
|
||||
virtual void SetSelection( long from, long to ) override;
|
||||
virtual void GetSelection(long *from, long *to) const override;
|
||||
|
||||
virtual wxString DoGetValue() const wxOVERRIDE;
|
||||
virtual void DoSetValue(const wxString &text, int flags = 0) wxOVERRIDE;
|
||||
virtual void WriteText(const wxString& text) wxOVERRIDE;
|
||||
virtual wxString DoGetValue() const override;
|
||||
virtual void DoSetValue(const wxString &text, int flags = 0) override;
|
||||
virtual void WriteText(const wxString& text) override;
|
||||
|
||||
virtual QWidget *GetHandle() const wxOVERRIDE;
|
||||
virtual QWidget *GetHandle() const override;
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual wxSize DoGetBestSize() const override;
|
||||
|
||||
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;
|
||||
|
||||
virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
|
||||
virtual QScrollArea *QtGetScrollBarsContainer() const override;
|
||||
|
||||
private:
|
||||
wxQtEdit *m_qtEdit;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue