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

28
tests/drawing/drawing.h
View file

@ -62,14 +62,14 @@ private:
{
public:
virtual ~ImageGraphicsContextLifeCycle() {}
virtual wxString GetIdForFileName () const wxOVERRIDE { return "image"; }
virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "png"; }
virtual bool UseImageComparison() const wxOVERRIDE { return true; }
virtual bool PlatformIndependent() const wxOVERRIDE { return false; }
virtual wxString GetIdForFileName () const override { return "image"; }
virtual wxString GetExtensionForFileName () const override { return "png"; }
virtual bool UseImageComparison() const override { return true; }
virtual bool PlatformIndependent() const override { return false; }
virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
double pointsPerInch, const wxFileName &targetFileName) wxOVERRIDE;
virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE;
virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE;
double pointsPerInch, const wxFileName &targetFileName) override;
virtual void SaveBuiltContext (wxGraphicsContext *&gc) override;
virtual void CleanUp (wxGraphicsContext *gc) override;
private:
wxImage *m_image;
wxString m_targetFileName;
@ -81,14 +81,14 @@ private:
class SvgGraphicsContextLifeCycle: public DrawingTestGCFactory
{
public:
virtual wxString GetIdForFileName () const wxOVERRIDE { return "svg"; }
virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "svg"; }
virtual bool UseImageComparison() const wxOVERRIDE { return false; }
virtual bool PlatformIndependent() const wxOVERRIDE { return true; }
virtual wxString GetIdForFileName () const override { return "svg"; }
virtual wxString GetExtensionForFileName () const override { return "svg"; }
virtual bool UseImageComparison() const override { return false; }
virtual bool PlatformIndependent() const override { return true; }
virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
double pointsPerInch, const wxFileName &targetFileName) wxOVERRIDE;
virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE;
virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE;
double pointsPerInch, const wxFileName &targetFileName) override;
virtual void SaveBuiltContext (wxGraphicsContext *&gc) override;
virtual void CleanUp (wxGraphicsContext *gc) override;
private:
wxSVGFileDC *m_svgFileDc;

14
tests/drawing/pluginsample.cpp
View file

@ -29,18 +29,18 @@ public:
virtual ~SampleDrawingTestGCFactory() {
}
virtual wxString GetIdForFileName () const wxOVERRIDE { return "sample-plg"; }
virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "bmp"; }
virtual wxString GetIdForFileName () const override { return "sample-plg"; }
virtual wxString GetExtensionForFileName () const override { return "bmp"; }
// Bitmaps are handled by wx code they should be binarily equal
virtual bool UseImageComparison() const wxOVERRIDE { return false; }
virtual bool UseImageComparison() const override { return false; }
// We use wxGraphicsContext, its implementation is not platform independent
// and returns may slightly vary
virtual bool PlatformIndependent() const wxOVERRIDE { return false; }
virtual bool PlatformIndependent() const override { return false; }
virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
double WXUNUSED(pointsPerInch), const wxFileName &targetFileName) wxOVERRIDE {
double WXUNUSED(pointsPerInch), const wxFileName &targetFileName) override {
m_image = new wxImage (expectedSize);
m_image->InitAlpha();
@ -54,14 +54,14 @@ public:
// Let's the opportunity to actually save the context and associated data
// If saving requires deleting the wxGraphicsContext object the
// implementer is free to do it but @c gc must then be nulled
virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE {
virtual void SaveBuiltContext (wxGraphicsContext *&gc) override {
wxDELETE(gc);
m_image->SaveFile (m_targetFileName);
}
// Cleans @c gc and internal data if any
virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE {
virtual void CleanUp (wxGraphicsContext *gc) override {
delete gc;
m_targetFileName.Empty();
wxDELETE(m_image);