From 8b56b16aca250be0f25881456350966a535095e2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 10 Oct 2006 10:29:41 +0000 Subject: [PATCH] removed spaces; added WXDLLEXPORTs; make overlay classes non copiable git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dc.h | 64 +++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/include/wx/dc.h b/include/wx/dc.h index faed2c0dce..afb298c3c3 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -965,64 +965,70 @@ private: // ---------------------------------------------------------------------------- // creates an overlay over an existing window, allowing for manipulations like -// rubberbanding etc. this API is not stable yet, not to be used outside wx +// rubberbanding etc. this API is not stable yet, not to be used outside wx // internal code // ---------------------------------------------------------------------------- -class wxOverlayImpl ; -class wxWindowDC ; +class WXDLLEXPORT wxOverlayImpl; +class WXDLLEXPORT wxWindowDC; -class WXDLLEXPORT wxOverlay +class WXDLLEXPORT wxOverlay { -public : - wxOverlay(); +public: + wxOverlay(); ~wxOverlay(); - + // clears the overlay without restoring the former state // to be done eg when the window content has been changed and repainted void Reset(); - -private : + +private: friend class WXDLLEXPORT wxDCOverlay; - + // returns true if it has been setup bool IsOk(); - void Init( wxWindowDC* dc, int x , int y , int width , int height ); - - void BeginDrawing( wxWindowDC* dc); - - void EndDrawing( wxWindowDC* dc); - - void Clear( wxWindowDC* dc); + void Init(wxWindowDC* dc, int x , int y , int width , int height); + + void BeginDrawing(wxWindowDC* dc); + + void EndDrawing(wxWindowDC* dc); + + void Clear(wxWindowDC* dc); wxOverlayImpl* m_impl; - + bool m_inDrawing; -} ; + + + DECLARE_NO_COPY_CLASS(wxOverlay); +}; class WXDLLEXPORT wxDCOverlay { -public : +public: // connects this overlay to the corresponding drawing dc, if the overlay is not initialized yet // this call will do so - wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height); - + wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height); + // convenience wrapper that behaves the same using the entire area of the dc - wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc); + wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc); // removes the connection between the overlay and the dc - virtual ~wxDCOverlay(); - + virtual ~wxDCOverlay(); + // clears the layer, restoring the state at the last init void Clear(); -private : + +private: void Init(wxWindowDC *dc, int x , int y , int width , int height); wxOverlay& m_overlay; wxWindowDC* m_dc; -} ; -#endif - // _WX_DC_H_BASE_ + + DECLARE_NO_COPY_CLASS(wxDCOverlay); +}; + +#endif // _WX_DC_H_BASE_ -- 2.45.2