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

virtual method hiding in GTK, so add direct implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-25 15:41:23 +00:00
parent 8e77fd8bca
commit cfcab929d4
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/bitmap.h
View File

@@ -176,7 +176,6 @@ public:
virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) = 0; virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) = 0; virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
// Create a bitmap compatible with the given DC, inheriting its magnification factor // Create a bitmap compatible with the given DC, inheriting its magnification factor
virtual bool Create(int width, int height, const wxDC& dc);
virtual int GetHeight() const = 0; virtual int GetHeight() const = 0;
virtual int GetWidth() const = 0; virtual int GetWidth() const = 0;

3
include/wx/gtk/bitmap.h
View File

@@ -87,6 +87,9 @@ public:
bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
{ return Create(sz.GetWidth(), sz.GetHeight(), depth); } { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
bool Create(int width, int height, const wxDC& WXUNUSED(dc))
{ return Create(width,height); }
virtual int GetHeight() const; virtual int GetHeight() const;
virtual int GetWidth() const; virtual int GetWidth() const;

5
src/common/bmpbase.cpp
View File

@@ -87,11 +87,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject)
wxList wxBitmapBase::sm_handlers; wxList wxBitmapBase::sm_handlers;
bool wxBitmapBase::Create(int width, int height, const wxDC& WXUNUSED(dc))
{
return Create(width,height);
}
void wxBitmapBase::AddHandler(wxBitmapHandler *handler) void wxBitmapBase::AddHandler(wxBitmapHandler *handler)
{ {
sm_handlers.Append(handler); sm_handlers.Append(handler);