From 4c44e0d048871ffc9d962d1359449a6103577b79 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 24 Oct 2006 16:44:26 +0000 Subject: [PATCH] correct access for virtuals git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/bitmap.h | 6 +++--- include/wx/gtk/dcclient.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 5280cab565..b6b32df260 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -117,14 +117,14 @@ public: protected: bool CreateFromImage(const wxImage& image, int depth); + virtual wxObjectRefData* CreateRefData() const; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; + private: // to be called from CreateFromImage only! bool CreateFromImageAsPixmap(const wxImage& image, int depth); bool CreateFromImageAsPixbuf(const wxImage& image); - virtual wxObjectRefData* CreateRefData() const; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; - enum Representation { Pixmap, diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index f6eee0b5fe..0239bc5cdd 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -123,7 +123,6 @@ public: void SetUpDC(); void Destroy(); -protected: virtual void ComputeScaleAndOrigin(); virtual GdkWindow *GetGDKWindow() const { return m_window; } -- 2.45.2