X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..d9e2e4c2425b8338ff6e6cd2fb62438c9fb2a12b:/include/wx/msw/pen.h diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 1cf0f4266c..2a96b98338 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -18,6 +18,7 @@ #include "wx/gdiobj.h" #include "wx/bitmap.h" +#include "wx/colour.h" typedef WXDWORD wxMSWDash; @@ -38,9 +39,17 @@ protected: int m_cap ; wxBitmap m_stipple ; int m_nbDash ; - wxMSWDash * m_dash ; + wxDash * m_dash ; wxColour m_colour; WXHPEN m_hPen; + +private: +// Cannot use +// DECLARE_NO_COPY_CLASS(wxPenRefData) +// because copy constructor is explicitly declared above; +// but no copy assignment operator is defined, so declare +// it private to prevent the compiler from defining it: + wxPenRefData& operator=(const wxPenRefData&); }; #define M_PENDATA ((wxPenRefData *)m_refData) @@ -89,7 +98,7 @@ public: // Internal bool RealizeResource(); bool FreeResource(bool force = FALSE); - WXHANDLE GetResourceHandle() ; + WXHANDLE GetResourceHandle() const; bool IsFree() const; void Unshare(); };