X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..b377eda09d9eca8810cee1c252879bee3c9bd190:/include/wx/mac/carbon/metafile.h?ds=sidebyside diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h index 2b528efeca..7bf91023d1 100644 --- a/include/wx/mac/carbon/metafile.h +++ b/include/wx/mac/carbon/metafile.h @@ -15,7 +15,6 @@ #ifndef _WX_METAFIILE_H_ #define _WX_METAFIILE_H_ -#if wxUSE_METAFILE #include "wx/dc.h" #include "wx/gdiobj.h" @@ -32,17 +31,7 @@ #define wxMetaFileDC wxMetafileDC class WXDLLEXPORT wxMetafile; - -class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData -{ - friend class WXDLLEXPORT wxMetafile; -public: - wxMetafileRefData(void); - ~wxMetafileRefData(void); - -public: - WXHMETAFILE m_metafile; -}; +class wxMetafileRefData ; #define M_METAFILEDATA ((wxMetafileRefData *)m_refData) @@ -63,20 +52,20 @@ public: virtual bool SetClipboard(int width = 0, int height = 0); virtual bool Play(wxDC *dc); - inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; + bool Ok() const ; wxSize GetSize() const; int GetWidth() const { return GetSize().x; } int GetHeight() const { return GetSize().y; } // Implementation - inline WXHMETAFILE GetHMETAFILE() const { return M_METAFILEDATA->m_metafile; } + WXHMETAFILE GetHMETAFILE() const ; 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: }; @@ -159,8 +148,5 @@ protected: }; #endif -#endif // wxUSE_METAFILE - - #endif // _WX_METAFIILE_H_