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

use wxOVERRIDE in wxMSW sources

Browse Source
This commit is contained in:
Paul Cornett
2016-09-23 07:59:11 -07:00
parent 9b477e46e5
commit 9b19a6e529
121 changed files with 1454 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/gdiimage.cpp
View File

@@ -72,10 +72,10 @@ public:
virtual bool LoadFile(wxBitmap *bitmap,
const wxString& name, wxBitmapType flags,
int desiredWidth, int desiredHeight);
int desiredWidth, int desiredHeight) wxOVERRIDE;
virtual bool SaveFile(const wxBitmap *bitmap,
const wxString& name, wxBitmapType type,
const wxPalette *palette = NULL) const;
const wxPalette *palette = NULL) const wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxBMPFileHandler);
@@ -92,7 +92,7 @@ public:
virtual bool LoadFile(wxBitmap *bitmap,
const wxString& name, wxBitmapType flags,
int desiredWidth, int desiredHeight);
int desiredWidth, int desiredHeight) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxBMPResourceHandler);
@@ -112,14 +112,14 @@ public:
wxBitmapType WXUNUSED(flags),
int WXUNUSED(width),
int WXUNUSED(height),
int WXUNUSED(depth) = 1)
int WXUNUSED(depth) = 1) wxOVERRIDE
{
return false;
}
virtual bool Save(const wxGDIImage *WXUNUSED(image),
const wxString& WXUNUSED(name),
wxBitmapType WXUNUSED(type)) const
wxBitmapType WXUNUSED(type)) const wxOVERRIDE
{
return false;
}
@@ -127,7 +127,7 @@ public:
virtual bool Load(wxGDIImage *image,
const wxString& name,
wxBitmapType flags,
int desiredWidth, int desiredHeight)
int desiredWidth, int desiredHeight) wxOVERRIDE
{
wxIcon *icon = wxDynamicCast(image, wxIcon);
wxCHECK_MSG( icon, false, wxT("wxIconHandler only works with icons") );
@@ -153,7 +153,7 @@ public:
protected:
virtual bool LoadIcon(wxIcon *icon,
const wxString& name, wxBitmapType flags,
int desiredWidth = -1, int desiredHeight = -1);
int desiredWidth = -1, int desiredHeight = -1) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxICOFileHandler);
@@ -171,7 +171,7 @@ public:
protected:
virtual bool LoadIcon(wxIcon *icon,
const wxString& name, wxBitmapType flags,
int desiredWidth = -1, int desiredHeight = -1);
int desiredWidth = -1, int desiredHeight = -1) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxICOResourceHandler);
@@ -190,7 +190,7 @@ public:
virtual bool LoadFile(wxBitmap *bitmap,
const wxString& name, wxBitmapType flags,
int desiredWidth, int desiredHeight);
int desiredWidth, int desiredHeight) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxPNGResourceHandler);