X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eb10e2a17a02acaaa32a41304243999f3a862a1..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/msw/enhmeta.h diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index efbaafd617..fa5389b1d0 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -12,10 +12,6 @@ #ifndef _WX_MSW_ENHMETA_H_ #define _WX_MSW_ENHMETA_H_ -#ifdef __GNUG__ - #pragma interface "enhmeta.h" -#endif - #include "wx/dc.h" #if wxUSE_DRAG_AND_DROP @@ -31,7 +27,7 @@ class WXDLLEXPORT wxEnhMetaFile : public wxObject public: wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file) { Init(); } - wxEnhMetaFile(const wxEnhMetaFile& metafile) + wxEnhMetaFile(const wxEnhMetaFile& metafile) : wxObject() { Init(); Assign(metafile); } wxEnhMetaFile& operator=(const wxEnhMetaFile& metafile) { Free(); Assign(metafile); return *this; } @@ -43,7 +39,8 @@ public: bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL); // accessors - bool Ok() const { return m_hMF != 0; } + bool Ok() const { return IsOk(); } + bool IsOk() const { return m_hMF != 0; } wxSize GetSize() const; int GetWidth() const { return GetSize().x; } @@ -61,7 +58,7 @@ public: void SetHENHMETAFILE(WXHANDLE hMF) { Free(); m_hMF = hMF; } protected: - void Init() { m_hMF = 0; } + void Init(); void Free(); void Assign(const wxEnhMetaFile& mf); @@ -90,7 +87,14 @@ public: // 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) }; @@ -160,6 +164,15 @@ public: virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + protected: wxEnhMetaFile m_metafile;