From 512cfcc34118a5da1b14c8cbaae1690fd4b23a4b Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 6 Dec 2007 16:22:00 +0000 Subject: [PATCH] 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/dcgraph.h | 8 +------- include/wx/gtk/dc.h | 2 -- include/wx/gtk/dcclient.h | 16 +++------------- include/wx/gtk/dcmemory.h | 3 --- include/wx/gtk/dcscreen.h | 10 ++++------ include/wx/mac/carbon/dcclient.h | 3 +-- include/wx/mac/carbon/dcmemory.h | 2 -- include/wx/msw/dc.h | 3 ++- include/wx/msw/dcclient.h | 14 ++++---------- include/wx/msw/dcmemory.h | 4 +--- include/wx/msw/dcscreen.h | 2 -- 11 files changed, 16 insertions(+), 51 deletions(-) diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 46781cc4e7..d51692eb4f 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -16,7 +16,6 @@ #include "wx/dc.h" #include "wx/geometry.h" -#include "wx/dynarray.h" #include "wx/graphics.h" class WXDLLIMPEXP_FWD_CORE wxWindowDC; @@ -33,13 +32,11 @@ public: wxGraphicsContext* GetGraphicsContext(); void SetGraphicsContext( wxGraphicsContext* ctx ); -private: DECLARE_DYNAMIC_CLASS(wxGCDC) DECLARE_NO_COPY_CLASS(wxGCDC) }; - class WXDLLEXPORT wxGCDCImpl: public wxDCImpl { public: @@ -95,7 +92,6 @@ public: wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; } virtual void SetGraphicsContext( wxGraphicsContext* ctx ); -protected: // the true implementations virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE); @@ -193,11 +189,9 @@ protected: wxGraphicsContext* m_graphicContext; -private: DECLARE_CLASS(wxGCDCImpl) DECLARE_NO_COPY_CLASS(wxGCDCImpl) }; -#endif - +#endif // wxUSE_GRAPHICS_CONTEXT #endif // _WX_GRAPHICS_DC_H_ diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h index 4cc1e61853..2e067abc95 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -36,12 +36,10 @@ public: virtual GdkWindow* GetGDKWindow() const { return NULL; } -protected: // base class pure virtuals implemented here virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); virtual void DoGetSizeMM(int* width, int* height) const; -private: DECLARE_ABSTRACT_CLASS(wxGTKDCImpl) }; diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 41cc073dac..4e79dab32d 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -7,10 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKDCCLIENTH__ -#define __GTKDCCLIENTH__ +#ifndef _WX_GTKDCCLIENT_H_ +#define _WX_GTKDCCLIENT_H_ -#include "wx/dc.h" #include "wx/gtk/dc.h" #include "wx/dcclient.h" #include "wx/region.h" @@ -32,7 +31,6 @@ public: virtual bool CanDrawBitmap() const { return true; } virtual bool CanGetTextExtent() const { return true; } -protected: virtual void DoGetSize(int *width, int *height) const; virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; @@ -75,8 +73,6 @@ protected: virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); - -public: virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharHeight() const; @@ -128,7 +124,6 @@ public: virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; } -private: DECLARE_ABSTRACT_CLASS(wxWindowDCImpl) }; @@ -142,10 +137,8 @@ public: wxClientDCImpl( wxDC *owner ); wxClientDCImpl( wxDC *owner, wxWindow *win ); -protected: virtual void DoGetSize(int *width, int *height) const; -private: DECLARE_ABSTRACT_CLASS(wxClientDCImpl) }; @@ -159,10 +152,7 @@ public: wxPaintDCImpl( wxDC *owner ); wxPaintDCImpl( wxDC *owner, wxWindow *win ); -private: DECLARE_ABSTRACT_CLASS(wxPaintDCImpl) }; -#endif - // __GTKDCCLIENTH__ - +#endif // _WX_GTKDCCLIENT_H_ diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index eefcadab27..ff470015c8 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -36,7 +36,6 @@ public: virtual void SetTextForeground( const wxColour &col ); virtual void SetTextBackground( const wxColour &col ); -protected: // overridden from wxDCImpl virtual void DoGetSize( int *width, int *height ) const; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; @@ -44,14 +43,12 @@ protected: // overridden for wxMemoryDC Impl virtual void DoSelect(const wxBitmap& bitmap); -public: virtual const wxBitmap& GetSelectedBitmap() const; virtual wxBitmap& GetSelectedBitmap(); private: wxBitmap m_selected; -private: void Init(); DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl) diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h index 5f9538b4ce..fecc443bdb 100644 --- a/include/wx/gtk/dcscreen.h +++ b/include/wx/gtk/dcscreen.h @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKDCSCREENH__ -#define __GTKDCSCREENH__ +#ifndef _WX_GTKDCSCREEN_H_ +#define _WX_GTKDCSCREEN_H_ #include "wx/dcscreen.h" #include "wx/gtk/dcclient.h" @@ -23,14 +23,12 @@ public: wxScreenDCImpl( wxScreenDC *owner ); ~wxScreenDCImpl(); -protected: virtual void DoGetSize(int *width, int *height) const; +protected: void Init(); -private: DECLARE_ABSTRACT_CLASS(wxScreenDCImpl) }; -#endif // __GTKDCSCREENH__ - +#endif // _WX_GTKDCSCREEN_H_ diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h index 6bb45e4a73..a35e461720 100644 --- a/include/wx/mac/carbon/dcclient.h +++ b/include/wx/mac/carbon/dcclient.h @@ -29,15 +29,14 @@ public: wxWindowDCImpl( wxDC *owner, wxWindow *window ); virtual ~wxWindowDCImpl(); -protected : virtual void DoGetSize( int *width, int *height ) const; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; +protected: bool m_release; int m_width; int m_height; -private: DECLARE_CLASS(wxWindowDCImpl) DECLARE_NO_COPY_CLASS(wxWindowDCImpl) }; diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h index e97091b201..71ff1f85ac 100644 --- a/include/wx/mac/carbon/dcmemory.h +++ b/include/wx/mac/carbon/dcmemory.h @@ -23,7 +23,6 @@ public: virtual ~wxMemoryDCImpl(); -protected: virtual void DoGetSize( int *width, int *height ) const; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } @@ -34,7 +33,6 @@ private: wxBitmap m_selected; -private: DECLARE_CLASS(wxMemoryDCImpl) DECLARE_NO_COPY_CLASS(wxMemoryDCImpl) }; diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index 9933e88db0..bd0fdb87af 100644 --- a/include/wx/msw/dc.h +++ b/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(), diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index 5dfe3bdc6c..4de0cc398d 100644 --- a/include/wx/msw/dcclient.h +++ b/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) }; diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h index d7c5918fa2..26471f7763 100644 --- a/include/wx/msw/dcmemory.h +++ b/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) }; diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h index 983d052a6a..f60bffa3d8 100644 --- a/include/wx/msw/dcscreen.h +++ b/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) }; -- 2.45.2