X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6151f2a94c8851e712755839106707a863c5449..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/include/wx/msw/dcclient.h diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index bad4cf72f2..6726151627 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -16,11 +16,9 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma interface "dcclient.h" -#endif - #include "wx/dc.h" +#include "wx/msw/dc.h" +#include "wx/dcclient.h" #include "wx/dynarray.h" // ---------------------------------------------------------------------------- @@ -28,7 +26,7 @@ // ---------------------------------------------------------------------------- // this one if used by wxPaintDC only -struct WXDLLEXPORT wxPaintDCInfo; +struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo; WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); @@ -36,56 +34,54 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); // DC classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDC : public wxDC +class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl { public: // default ctor - wxWindowDC(); + wxWindowDCImpl( wxDC *owner ); // Create a DC corresponding to the whole window - wxWindowDC(wxWindow *win); + wxWindowDCImpl( wxDC *owner, wxWindow *win ); + + virtual void DoGetSize(int *width, int *height) const; 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_NO_COPY(wxWindowDC) + DECLARE_CLASS(wxWindowDCImpl) + wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); }; -class WXDLLEXPORT wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl { public: // default ctor - wxClientDC(); + wxClientDCImpl( wxDC *owner ); // Create a DC corresponding to the client area of the window - wxClientDC(wxWindow *win); + wxClientDCImpl( wxDC *owner, wxWindow *win ); + + virtual ~wxClientDCImpl(); - virtual ~wxClientDC(); + 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_DYNAMIC_CLASS_NO_COPY(wxClientDC) + DECLARE_CLASS(wxClientDCImpl) + wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); }; -class WXDLLEXPORT wxPaintDC : public wxClientDC +class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl { public: - wxPaintDC(); + wxPaintDCImpl( wxDC *owner ); // Create a DC corresponding for painting the window in OnPaint() - wxPaintDC(wxWindow *win); + wxPaintDCImpl( wxDC *owner, wxWindow *win ); - virtual ~wxPaintDC(); + virtual ~wxPaintDCImpl(); // find the entry for this DC in the cache (keyed by the window) static WXHDC FindDCInCache(wxWindow* win); @@ -96,8 +92,8 @@ protected: // find the entry for this DC in the cache (keyed by the window) wxPaintDCInfo *FindInCache(size_t *index = NULL) const; -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC) + DECLARE_CLASS(wxPaintDCImpl) + wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); }; /* @@ -106,16 +102,13 @@ private: * message. It is used in HandlePaint and need not be used by an application. */ -class WXDLLEXPORT wxPaintDCEx : public wxPaintDC +class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC { public: wxPaintDCEx(wxWindow *canvas, WXHDC dc); - virtual ~wxPaintDCEx(); -private: - int saveState; DECLARE_CLASS(wxPaintDCEx) - DECLARE_NO_COPY_CLASS(wxPaintDCEx) + wxDECLARE_NO_COPY_CLASS(wxPaintDCEx); }; #endif