make access for virtuals match base

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

include/wx/msw/dc.h

@@ -164,6 +164,7 @@ protected:
 
     void RealizeScaleAndOrigin();
 
+public:
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
@@ -260,6 +261,7 @@ protected:
     void InitializePalette();
 #endif // wxUSE_PALETTE
 
+protected:
     // common part of DoDrawText() and DoDrawRotatedText()
     void DrawAnyText(const wxString& text, wxCoord x, wxCoord y);
 
@@ -334,7 +336,6 @@ public:
         SetHDC((WXHDC)NULL);
     }
 
-protected:
     virtual void DoGetSize(int *w, int *h) const
     {
         wxASSERT_MSG( m_size.IsFullySpecified(),

include/wx/msw/dcclient.h

@@ -43,14 +43,12 @@ public:
     // Create a DC corresponding to the whole window
     wxWindowDCImpl( wxDC *owner, wxWindow *win );
 
+    virtual void DoGetSize(int *width, int *height) const;
+
 protected:
     // initialize the newly created DC
     void InitDC();
 
-    // override some base class virtuals
-    virtual void DoGetSize(int *width, int *height) const;
-
-private:
     DECLARE_CLASS(wxWindowDCImpl)
     DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
 };
@@ -66,13 +64,11 @@ public:
 
     virtual ~wxClientDCImpl();
 
+    virtual void DoGetSize(int *width, int *height) const;
+
 protected:
     void InitDC();
 
-    // override some base class virtuals
-    virtual void DoGetSize(int *width, int *height) const;
-
-private:
     DECLARE_CLASS(wxClientDCImpl)
     DECLARE_NO_COPY_CLASS(wxClientDCImpl)
 };
@@ -96,7 +92,6 @@ protected:
     // find the entry for this DC in the cache (keyed by the window)
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
-private:
     DECLARE_CLASS(wxPaintDCImpl)
     DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
 };
@@ -112,7 +107,6 @@ class WXDLLEXPORT wxPaintDCEx : public wxPaintDC
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
     
-private:
     DECLARE_CLASS(wxPaintDCEx)
     DECLARE_NO_COPY_CLASS(wxPaintDCEx)
 };

include/wx/msw/dcmemory.h

@@ -22,8 +22,6 @@ public:
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
     wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC
 
-
-protected:
     // override some base class virtuals
     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSize(int* width, int* height) const;
@@ -32,13 +30,13 @@ protected:
     virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const 
     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}
 
+protected:
     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC *dc);
 
     // initialize the newly created DC
     void Init();
 
-private:
     DECLARE_CLASS(wxMemoryDCImpl)
     DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
 };

include/wx/msw/dcscreen.h

@@ -21,13 +21,11 @@ public:
     // Create a DC representing the whole screen
     wxScreenDCImpl( wxScreenDC *owner );
 
-protected:
     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);
     }
 
-private:
     DECLARE_CLASS(wxScreenDCImpl)
     DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
 };