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
This commit is contained in:
Vadim Zeitlin
2006-10-10 10:29:41 +00:00
parent 861410228d
commit 8b56b16aca

View File

@@ -969,12 +969,12 @@ private:
// internal code // internal code
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxOverlayImpl ; class WXDLLEXPORT wxOverlayImpl;
class wxWindowDC ; class WXDLLEXPORT wxWindowDC;
class WXDLLEXPORT wxOverlay class WXDLLEXPORT wxOverlay
{ {
public : public:
wxOverlay(); wxOverlay();
~wxOverlay(); ~wxOverlay();
@@ -982,28 +982,31 @@ public :
// to be done eg when the window content has been changed and repainted // to be done eg when the window content has been changed and repainted
void Reset(); void Reset();
private : private:
friend class WXDLLEXPORT wxDCOverlay; friend class WXDLLEXPORT wxDCOverlay;
// returns true if it has been setup // returns true if it has been setup
bool IsOk(); bool IsOk();
void Init( wxWindowDC* dc, int x , int y , int width , int height ); void Init(wxWindowDC* dc, int x , int y , int width , int height);
void BeginDrawing( wxWindowDC* dc); void BeginDrawing(wxWindowDC* dc);
void EndDrawing( wxWindowDC* dc); void EndDrawing(wxWindowDC* dc);
void Clear( wxWindowDC* dc); void Clear(wxWindowDC* dc);
wxOverlayImpl* m_impl; wxOverlayImpl* m_impl;
bool m_inDrawing; bool m_inDrawing;
} ;
DECLARE_NO_COPY_CLASS(wxOverlay);
};
class WXDLLEXPORT wxDCOverlay class WXDLLEXPORT wxDCOverlay
{ {
public : public:
// connects this overlay to the corresponding drawing dc, if the overlay is not initialized yet // connects this overlay to the corresponding drawing dc, if the overlay is not initialized yet
// this call will do so // 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);
@@ -1016,13 +1019,16 @@ public :
// clears the layer, restoring the state at the last init // clears the layer, restoring the state at the last init
void Clear(); void Clear();
private :
private:
void Init(wxWindowDC *dc, int x , int y , int width , int height); void Init(wxWindowDC *dc, int x , int y , int width , int height);
wxOverlay& m_overlay; wxOverlay& m_overlay;
wxWindowDC* m_dc; wxWindowDC* m_dc;
} ;
#endif
// _WX_DC_H_BASE_ DECLARE_NO_COPY_CLASS(wxDCOverlay);
};
#endif // _WX_DC_H_BASE_