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

Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept

Browse source 
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
PB 2022-10-12 17:07:48 +02:00 • committed by Vadim Zeitlin
parent be5095acdd
commit 88d526660f
1282 changed files with 11878 additions and 11878 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/wx/qt/frame.h
View file

@ -42,23 +42,23 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxASCII_STR(wxFrameNameStr));
virtual void SetMenuBar(wxMenuBar *menubar) wxOVERRIDE;
virtual void SetStatusBar(wxStatusBar *statusBar ) wxOVERRIDE;
virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE;
virtual void SetMenuBar(wxMenuBar *menubar) override;
virtual void SetStatusBar(wxStatusBar *statusBar ) override;
virtual void SetToolBar(wxToolBar *toolbar) override;
virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
virtual void SetWindowStyleFlag( long style ) override;
virtual void AddChild( wxWindowBase *child ) wxOVERRIDE;
virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE;
virtual void AddChild( wxWindowBase *child ) override;
virtual void RemoveChild( wxWindowBase *child ) override;
QMainWindow *GetQMainWindow() const;
virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
virtual QScrollArea *QtGetScrollBarsContainer() const override;
protected:
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const override;
virtual void DoSetClientSize(int width, int height) override;
virtual QWidget* QtGetParentWidget() const wxOVERRIDE;
virtual QWidget* QtGetParentWidget() const override;
private:
// Common part of all ctors.