X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2555abd7afd7a7a6017f46dd6550d804850fb9f..ba5b8a68f7486cfb11e326c200e1c2df3e1a534d:/include/wx/mac/carbon/metafile.h diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h index 23a0dc9570..add0be172a 100644 --- a/include/wx/mac/carbon/metafile.h +++ b/include/wx/mac/carbon/metafile.h @@ -39,11 +39,6 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject { DECLARE_DYNAMIC_CLASS(wxMetafile) public: - // Copy constructor - wxMetafile(const wxMetafile& metafile) - : wxGDIObject() - { Ref(metafile); } - wxMetafile(const wxString& file = wxEmptyString); ~wxMetafile(void); @@ -63,9 +58,8 @@ public: void SetHMETAFILE(WXHMETAFILE mf) ; // Operators - inline wxMetafile& operator = (const wxMetafile& metafile) { if (*this == metafile) return (*this); Ref(metafile); return *this; } - inline bool operator == (const wxMetafile& metafile) { return m_refData == metafile.m_refData; } - inline bool operator != (const wxMetafile& metafile) { return m_refData != metafile.m_refData; } + inline bool operator == (const wxMetafile& metafile) const { return m_refData == metafile.m_refData; } + inline bool operator != (const wxMetafile& metafile) const { return m_refData != metafile.m_refData; } protected: }; @@ -85,13 +79,14 @@ class WXDLLEXPORT wxMetafileDC: public wxDC // Should be called at end of drawing virtual wxMetafile *Close(void); - virtual void DoGetSize(int *width, int *height) const ; // Implementation inline wxMetafile *GetMetaFile(void) const { return m_metaFile; } inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } protected: + virtual void DoGetSize(int *width, int *height) const; + wxMetafile* m_metaFile; };