X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/msw/metafile.h?ds=sidebyside diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index 8ac8a37734..8991f58c91 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,22 +24,25 @@ class WXDLLIMPEXP_FWD_CORE wxMetafile; -class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData { - friend class WXDLLIMPEXP_FWD_CORE wxMetafile; public: wxMetafileRefData(); virtual ~wxMetafileRefData(); + virtual bool IsOk() const { return m_metafile != 0; } + public: WXHANDLE m_metafile; int m_windowsMappingMode; int m_width, m_height; + + friend class WXDLLIMPEXP_FWD_CORE wxMetafile; }; #define M_METAFILEDATA ((wxMetafileRefData *)m_refData) -class WXDLLEXPORT wxMetafile: public wxGDIObject +class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject { public: wxMetafile(const wxString& file = wxEmptyString); @@ -51,8 +53,6 @@ public: virtual bool SetClipboard(int width = 0, int height = 0); virtual bool Play(wxDC *dc); - bool Ok() const { return IsOk(); } - bool IsOk() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; // set/get the size of metafile for clipboard operations wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); } @@ -68,19 +68,24 @@ public: int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; } void SetWindowsMappingMode(int mm); +protected: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + private: DECLARE_DYNAMIC_CLASS(wxMetafile) }; -class WXDLLEXPORT wxMetafileDCImpl: public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxMSWDCImpl { public: - wxMetafileDCImpl(const wxString& file = wxEmptyString); - wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg); + wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString); + wxMetafileDCImpl(wxDC *owner, const wxString& file, + int xext, int yext, int xorg, int yorg); virtual ~wxMetafileDCImpl(); virtual wxMetafile *Close(); - virtual void SetMapMode(int mode); + virtual void SetMapMode(wxMappingMode mode); virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, @@ -101,31 +106,33 @@ protected: private: DECLARE_CLASS(wxMetafileDCImpl) - DECLARE_NO_COPY_CLASS(wxMetafileDCImpl) + wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl); }; -class WXDLLEXPORT wxMetafileDC: public wxDC +class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC { public: // Don't supply origin and extent // Supply them to wxMakeMetaFilePlaceable instead. - wxMetafileDC(const wxString& file); - { m_pimpl = new wxMetafileDCImpl( this, file ); } + wxMetafileDC(const wxString& file) + : wxDC(new wxMetafileDCImpl( this, file )) + { } // Supply origin and extent (recommended). // Then don't need to supply them to wxMakeMetaFilePlaceable. wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg) - { m_pimpl = new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ); } + : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg )) + { } - wxMetafile *GetMetafile() const + wxMetafile *GetMetafile() const { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); } - + wxMetafile *Close() { return ((wxMetafileDCImpl*)m_pimpl)->Close(); } private: DECLARE_CLASS(wxMetafileDC) - DECLARE_NO_COPY_CLASS(wxMetafileDC) + wxDECLARE_NO_COPY_CLASS(wxMetafileDC); }; @@ -139,10 +146,10 @@ private: */ // No origin or extent -bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); +bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); // Optional origin and extent -bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true); +bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true); // ---------------------------------------------------------------------------- // wxMetafileDataObject is a specialization of wxDataObject for metafile data @@ -150,7 +157,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y #if wxUSE_DRAG_AND_DROP -class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple { public: // ctors