correct access for virtuals

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 5280cab5651b02e896223a3ec500b83af0915466..b6b32df260cdc8bca0bcfb8ac79c38682d57d218 100644 (file)
--- 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 f6eee0b5fed6bdbbed0409ec3eb5007acfcafeba..0239bc5cddb2da14f666296dcf055c17690c5318 100644 (file)
--- 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; }