X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..032e024c1c6ab6a20226604baab9d00558620e72:/include/wx/msw/enhmeta.h?ds=sidebyside diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index f892b1927b..e4cd9b3284 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -13,6 +13,7 @@ #define _WX_MSW_ENHMETA_H_ #include "wx/dc.h" +#include "wx/gdiobj.h" #if wxUSE_DRAG_AND_DROP #include "wx/dataobj.h" @@ -22,12 +23,12 @@ // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFile : public wxObject +class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject { public: wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file) { Init(); } - wxEnhMetaFile(const wxEnhMetaFile& metafile) : wxObject() + wxEnhMetaFile(const wxEnhMetaFile& metafile) : wxGDIObject() { Init(); Assign(metafile); } wxEnhMetaFile& operator=(const wxEnhMetaFile& metafile) { Free(); Assign(metafile); return *this; } @@ -36,10 +37,10 @@ public: { Free(); } // display the picture stored in the metafile on the given DC - bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL); + bool Play(wxDC *dc, wxRect *rectBound = NULL); // accessors - bool Ok() const { return m_hMF != 0; } + virtual bool IsOk() const { return m_hMF != 0; } wxSize GetSize() const; int GetWidth() const { return GetSize().x; } @@ -61,6 +62,11 @@ protected: void Free(); void Assign(const wxEnhMetaFile& mf); + // we don't use these functions (but probably should) but have to implement + // them as they're pure virtual in the base class + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + private: wxString m_filename; WXHANDLE m_hMF; @@ -72,7 +78,7 @@ private: // wxEnhMetaFileDC: allows to create a wxEnhMetaFile // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFileDC : public wxDC +class WXDLLIMPEXP_CORE wxEnhMetaFileDC : public wxDC { public: // the ctor parameters specify the filename (empty for memory metafiles), @@ -81,7 +87,12 @@ public: int width = 0, int height = 0, const wxString& description = wxEmptyString); - virtual ~wxEnhMetaFileDC(); + // as above, but takes reference DC as first argument to take resolution, + // size, font metrics etc. from + wxEnhMetaFileDC(const wxDC& referenceDC, + const wxString& filename = wxEmptyString, + int width = 0, int height = 0, + const wxString& description = wxEmptyString); // obtain a pointer to the new metafile (caller should delete it) wxEnhMetaFile *Close(); @@ -98,7 +109,7 @@ private: // notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and // so we derive from wxDataObject and not from wxDataObjectSimple -class WXDLLEXPORT wxEnhMetaFileDataObject : public wxDataObject +class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject { public: // ctors @@ -125,7 +136,7 @@ public: protected: wxEnhMetaFile m_metafile; - DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject) + wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject); }; @@ -136,7 +147,7 @@ protected: // CF_ENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple { public: // ctors @@ -168,7 +179,7 @@ public: protected: wxEnhMetaFile m_metafile; - DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject) + wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject); }; #endif // wxUSE_DRAG_AND_DROP