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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index c6eceb596c6830a64d560f913af996782ce34e6d..353d2ec04dc80dc2b3858647cf5e6b14f06f49ed 100644 (file)
--- 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 afd8247eb444bd6249a135a4f35e0fae94530d20..e1b6e792ad474bd28ea832b134bdf830c0d028a3 100644 (file)
--- 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 1a0c5d7809c7bc94ddc495962e28d621260a10c8..46804febbd8436d329f880f9098bb8f17fd92500 100644 (file)
--- 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);