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

10
include/wx/msw/bitmap.h
View File

@@ -206,8 +206,8 @@ public:
wxDC *GetSelectedInto() const;
protected:
virtual wxGDIImageRefData *CreateData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIImageRefData *CreateData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
// creates an uninitialized bitmap, called from Create()s above
bool DoCreate(int w, int h, int depth, WXHDC hdc);
@@ -295,14 +295,14 @@ public:
virtual bool Create(wxGDIImage *image,
const void* data,
wxBitmapType type,
int width, int height, int depth = 1);
int width, int height, int depth = 1) wxOVERRIDE;
virtual bool Load(wxGDIImage *image,
const wxString& name,
wxBitmapType type,
int desiredWidth, int desiredHeight);
int desiredWidth, int desiredHeight) wxOVERRIDE;
virtual bool Save(const wxGDIImage *image,
const wxString& name,
wxBitmapType type) const;
wxBitmapType type) const wxOVERRIDE;
// make wxBitmapHandler compatible with the wxBitmapHandler interface