API adaptions to MSW EnhMetafile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-03 14:10:04 +00:00
parent 29402f455b
commit 35c40e78c6

View File

@@ -49,7 +49,7 @@ public:
class WXDLLEXPORT wxMetafile: public wxGDIObject class WXDLLEXPORT wxMetafile: public wxGDIObject
{ {
DECLARE_DYNAMIC_CLASS(wxMetafile) DECLARE_DYNAMIC_CLASS(wxMetafile)
public: public:
// Copy constructor // Copy constructor
wxMetafile(const wxMetafile& metafile) wxMetafile(const wxMetafile& metafile)
: wxGDIObject() : wxGDIObject()
@@ -65,8 +65,12 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
virtual bool Play(wxDC *dc); virtual bool Play(wxDC *dc);
inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
wxSize GetSize() const;
int GetWidth() const { return GetSize().x; }
int GetHeight() const { return GetSize().y; }
// Implementation // Implementation
inline WXHMETAFILE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; } inline WXHMETAFILE GetHMETAFILE() const { return M_METAFILEDATA->m_metafile; }
void SetHMETAFILE(WXHMETAFILE mf) ; void SetHMETAFILE(WXHMETAFILE mf) ;
// Operators // Operators
@@ -82,18 +86,17 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
DECLARE_DYNAMIC_CLASS(wxMetafileDC) DECLARE_DYNAMIC_CLASS(wxMetafileDC)
public: public:
// Don't supply origin and extent // the ctor parameters specify the filename (empty for memory metafiles),
// Supply them to wxMakeMetaFilePlaceable instead. // the metafile picture size and the optional description/comment
wxMetafileDC(const wxString& file = wxEmptyString); wxMetafileDC(const wxString& filename = wxEmptyString,
int width = 0, int height = 0,
// Supply origin and extent (recommended). const wxString& description = wxEmptyString);
// Then don't need to supply them to wxMakeMetaFilePlaceable.
wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);
~wxMetafileDC(void); ~wxMetafileDC(void);
// Should be called at end of drawing // Should be called at end of drawing
virtual wxMetafile *Close(void); virtual wxMetafile *Close(void);
virtual void DoGetSize(int *width, int *height) const ;
// Implementation // Implementation
inline wxMetafile *GetMetaFile(void) const { return m_metaFile; } inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
@@ -143,6 +146,14 @@ public:
virtual bool GetDataHere(void *buf) const; virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf); 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: protected:
wxMetafile m_metafile; wxMetafile m_metafile;
}; };