X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/994a3786b974a2c5b8dfce631193ae0031e7da3f..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/dcclient.h diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index ccf5927bf2..6399130d1c 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -5,8 +5,8 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DCCLIENT_H_ @@ -16,10 +16,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma interface "dcclient.h" -#endif - #include "wx/dc.h" #include "wx/dynarray.h" @@ -28,7 +24,7 @@ // ---------------------------------------------------------------------------- // this one if used by wxPaintDC only -struct WXDLLEXPORT wxPaintDCInfo; +struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo; WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); @@ -46,14 +42,14 @@ public: wxWindowDC(wxWindow *win); protected: - // intiialize the newly created DC + // initialize the newly created DC void InitDC(); // override some base class virtuals virtual void DoGetSize(int *width, int *height) const; private: - DECLARE_DYNAMIC_CLASS(wxWindowDC) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC) }; class WXDLLEXPORT wxClientDC : public wxWindowDC @@ -74,7 +70,7 @@ protected: virtual void DoGetSize(int *width, int *height) const; private: - DECLARE_DYNAMIC_CLASS(wxClientDC) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxClientDC) }; class WXDLLEXPORT wxPaintDC : public wxClientDC @@ -97,7 +93,25 @@ protected: wxPaintDCInfo *FindInCache(size_t *index = NULL) const; private: - DECLARE_DYNAMIC_CLASS(wxPaintDC) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC) +}; + +/* + * wxPaintDCEx + * This class is used when an application sends an HDC with the WM_PAINT + * message. It is used in HandlePaint and need not be used by an application. + */ + +class WXDLLEXPORT wxPaintDCEx : public wxPaintDC +{ +public: + wxPaintDCEx(wxWindow *canvas, WXHDC dc); + virtual ~wxPaintDCEx(); +private: + int saveState; + + DECLARE_CLASS(wxPaintDCEx) + DECLARE_NO_COPY_CLASS(wxPaintDCEx) }; #endif