From cfcab929d4137d7eaf68cfad43601fe8baf461bd Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 25 Jun 2013 15:41:23 +0000 Subject: [PATCH] virtual method hiding in GTK, so add direct implementation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/bitmap.h | 1 - include/wx/gtk/bitmap.h | 3 +++ src/common/bmpbase.cpp | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index c6eceb596c..353d2ec04d 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -176,7 +176,6 @@ public: 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; // 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 GetWidth() const = 0; diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index afd8247eb4..e1b6e792ad 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -87,6 +87,9 @@ public: bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_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 GetWidth() const; diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index 1a0c5d7809..46804febbd 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -87,11 +87,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject) wxList wxBitmapBase::sm_handlers; -bool wxBitmapBase::Create(int width, int height, const wxDC& WXUNUSED(dc)) -{ - return Create(width,height); -} - void wxBitmapBase::AddHandler(wxBitmapHandler *handler) { sm_handlers.Append(handler);