From: Paul Cornett Date: Thu, 7 Dec 2006 05:44:44 +0000 (+0000) Subject: correct access for virtuals X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3498362ed5759522a9664a70e4da819e51bd2fbe correct access for virtuals git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h index af42e0135d..4c76214c2a 100644 --- a/include/wx/dcmemory.h +++ b/include/wx/dcmemory.h @@ -12,7 +12,6 @@ #ifndef _WX_DCMEMORY_H_BASE_ #define _WX_DCMEMORY_H_BASE_ -#include "wx/defs.h" #include "wx/bitmap.h" // NOTE: different native implementations of wxMemoryDC will derive from @@ -45,6 +44,7 @@ public: DoSelect(bmp); } +protected: virtual void DoSelect(const wxBitmap& bmp) = 0; }; diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index 4afeaf4bce..94de61a1f3 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -7,18 +7,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKDCMEMORYH__ -#define __GTKDCMEMORYH__ +#ifndef _WX_GTK_DCMEMORY_H_ +#define _WX_GTK_DCMEMORY_H_ -#include "wx/defs.h" #include "wx/dcclient.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMemoryDC; - //----------------------------------------------------------------------------- // wxMemoryDC //----------------------------------------------------------------------------- @@ -48,15 +41,13 @@ public: protected: void DoGetSize( int *width, int *height ) const; virtual void DoSelect(const wxBitmap& bitmap); + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const + { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } private: void Init(); - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const - { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } DECLARE_DYNAMIC_CLASS(wxMemoryDC) }; -#endif - // __GTKDCMEMORYH__ - +#endif // _WX_GTK_DCMEMORY_H_ diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index 317dced92d..60b1c7bea5 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -8,10 +8,8 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __gprint_H__ -#define __gprint_H__ - -// Include wxWindows' headers +#ifndef _WX_GTK_GPRINT_H_ +#define _WX_GTK_GPRINT_H_ #include "wx/defs.h" @@ -50,7 +48,6 @@ private: GnomePrintConfig *m_config; GnomePrintJob *m_job; -private: DECLARE_DYNAMIC_CLASS(wxGnomePrintNativeData) }; @@ -116,7 +113,7 @@ public: virtual bool TransferDataToWindow(); virtual bool TransferDataFromWindow(); -private: +protected: // Implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), @@ -125,10 +122,10 @@ private: virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height)) {} +private: void Init(); wxPrintDialogData m_printDialogData; -private: DECLARE_DYNAMIC_CLASS(wxGnomePrintDialog) }; @@ -151,7 +148,7 @@ public: virtual bool TransferDataToWindow(); virtual bool TransferDataFromWindow(); -private: +protected: // Implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), @@ -160,9 +157,9 @@ private: virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height)) {} +private: wxPageSetupDialogData m_pageDialogData; -private: DECLARE_DYNAMIC_CLASS(wxGnomePageSetupDialog) }; @@ -207,6 +204,32 @@ public: bool Ok() const { return IsOk(); } bool IsOk() const; + bool CanDrawBitmap() const { return true; } + void Clear(); + void SetFont( const wxFont& font ); + void SetPen( const wxPen& pen ); + void SetBrush( const wxBrush& brush ); + void SetLogicalFunction( int function ); + void SetBackground( const wxBrush& brush ); + void DestroyClippingRegion(); + bool StartDoc(const wxString& message); + void EndDoc(); + void StartPage(); + void EndPage(); + wxCoord GetCharHeight() const; + wxCoord GetCharWidth() const; + bool CanGetTextExtent() const { return true; } + wxSize GetPPI() const; + void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); + void SetLogicalOrigin( wxCoord x, wxCoord y ); + void SetDeviceOrigin( wxCoord x, wxCoord y ); + virtual int GetDepth() const { return 24; } + void SetBackgroundMode(int WXUNUSED(mode)) { } + void SetPalette(const wxPalette& WXUNUSED(palette)) { } + static void SetResolution(int ppi); + static int GetResolution(); + +protected: bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE ); bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); @@ -223,59 +246,25 @@ public: #if wxUSE_SPLINES void DoDrawSpline(wxList *points); #endif // wxUSE_SPLINES - bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false ); - bool CanDrawBitmap() const { return true; } - void DoDrawText(const wxString& text, wxCoord x, wxCoord y ); void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); - void Clear(); - void SetFont( const wxFont& font ); - void SetPen( const wxPen& pen ); - void SetBrush( const wxBrush& brush ); - void SetLogicalFunction( int function ); - void SetBackground( const wxBrush& brush ); - void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DestroyClippingRegion(); void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) { } - - bool StartDoc(const wxString& message); - void EndDoc(); - void StartPage(); - void EndPage(); - - wxCoord GetCharHeight() const; - wxCoord GetCharWidth() const; - bool CanGetTextExtent() const { return true; } void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, wxFont *theFont = (wxFont *) NULL ) const; - void DoGetSize(int* width, int* height) const; void DoGetSizeMM(int *width, int *height) const; - wxSize GetPPI() const; - void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); - - void SetLogicalOrigin( wxCoord x, wxCoord y ); - void SetDeviceOrigin( wxCoord x, wxCoord y ); - - virtual int GetDepth() const { return 24; } - - void SetBackgroundMode(int WXUNUSED(mode)) { } - void SetPalette(const wxPalette& WXUNUSED(palette)) { } wxPrintData& GetPrintData() { return m_printData; } void SetPrintData(const wxPrintData& data) { m_printData = data; } - static void SetResolution(int ppi); - static int GetResolution(); - private: static float ms_PSScaleFactor; diff --git a/include/wx/gtk/gnome/gvfs.h b/include/wx/gtk/gnome/gvfs.h index cdfe38b16a..6d65e6f977 100644 --- a/include/wx/gtk/gnome/gvfs.h +++ b/include/wx/gtk/gnome/gvfs.h @@ -8,10 +8,8 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __gvfs_H__ -#define __gvfs_H__ - -// Include wxWindows' headers +#ifndef _WX_GTK_GVFS_H_ +#define _WX_GTK_GVFS_H_ #include "wx/defs.h" @@ -28,7 +26,8 @@ class wxGnomeVFSMimeTypesManagerImpl: public wxMimeTypesManagerImpl { public: wxGnomeVFSMimeTypesManagerImpl() { } - + +protected: virtual bool DoAssociation(const wxString& strType, const wxString& strIcon, wxMimeTypeCommands *entry, diff --git a/include/wx/imagtga.h b/include/wx/imagtga.h index a883bde7d6..b5fdc3362b 100644 --- a/include/wx/imagtga.h +++ b/include/wx/imagtga.h @@ -34,10 +34,10 @@ public: bool verbose = true, int index = -1); virtual bool SaveFile(wxImage* image, wxOutputStream& stream, bool verbose = true); +protected: virtual bool DoCanRead(wxInputStream& stream); #endif // wxUSE_STREAMS -private: DECLARE_DYNAMIC_CLASS(wxTGAHandler) }; diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index c737099e2f..5b4c1cd0b3 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -248,8 +248,6 @@ public: // do the window-specific processing after processing the update event virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ; -protected: - // a different API for SetSizeHints virtual void SetMinSize(const wxSize& minSize); virtual void SetMaxSize(const wxSize& maxSize); @@ -259,6 +257,7 @@ protected: int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, int incW = wxDefaultCoord, int incH = wxDefaultCoord ); +protected: // the frame client to screen translation should take account of the // toolbar which may shift the origin of the client area virtual void DoClientToScreen(int *x, int *y) const;