X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..3aa8e4ea6db0478d3bc862f59f100408bdc8732f:/include/wx/msw/enhmeta.h?ds=sidebyside diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index fa5389b1d0..2e894bbbb5 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 WXDLLEXPORT 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; } @@ -39,8 +40,7 @@ public: bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL); // accessors - bool Ok() const { return IsOk(); } - bool IsOk() const { return m_hMF != 0; } + virtual bool IsOk() const { return m_hMF != 0; } wxSize GetSize() const; int GetWidth() const { return GetSize().x; } @@ -62,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; @@ -82,19 +87,6 @@ public: int width = 0, int height = 0, const wxString& description = wxEmptyString); - virtual ~wxEnhMetaFileDC(); - - // obtain a pointer to the new metafile (caller should delete it) - wxEnhMetaFile *Close(); - -protected: - virtual void DoGetSize(int *width, int *height) const; - -private: - // size passed to ctor and returned by DoGetSize() - int m_width, - m_height; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxEnhMetaFileDC) };