X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..5852a1dcbbadb7fd0d5a9d7851aaa67f2370f3cf:/include/wx/msw/dcclient.h diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index 5dfe3bdc6c..eed5e21e59 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -34,7 +34,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); // DC classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDCImpl : public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl { public: // default ctor @@ -43,19 +43,17 @@ public: // Create a DC corresponding to the whole window wxWindowDCImpl( wxDC *owner, wxWindow *win ); + virtual void DoGetSize(int *width, int *height) const; + protected: // initialize the newly created DC void InitDC(); - // override some base class virtuals - virtual void DoGetSize(int *width, int *height) const; - -private: DECLARE_CLASS(wxWindowDCImpl) DECLARE_NO_COPY_CLASS(wxWindowDCImpl) }; -class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl { public: // default ctor @@ -66,18 +64,16 @@ public: virtual ~wxClientDCImpl(); + 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_CLASS(wxClientDCImpl) DECLARE_NO_COPY_CLASS(wxClientDCImpl) }; -class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl +class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl { public: wxPaintDCImpl( wxDC *owner ); @@ -96,7 +92,6 @@ protected: // find the entry for this DC in the cache (keyed by the window) wxPaintDCInfo *FindInCache(size_t *index = NULL) const; -private: DECLARE_CLASS(wxPaintDCImpl) DECLARE_NO_COPY_CLASS(wxPaintDCImpl) }; @@ -107,12 +102,11 @@ 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); -private: DECLARE_CLASS(wxPaintDCEx) DECLARE_NO_COPY_CLASS(wxPaintDCEx) };