X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0273787aba66cc4e0e0107b624efcf3d87f55917..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/msw/enhmeta.h?ds=sidebyside diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index 264cccb188..3951bd7f5a 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 13.01.00 -// RCS-ID: $Id$ // Copyright: (c) 2000 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -23,7 +22,7 @@ // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFile : public wxGDIObject +class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject { public: wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file) @@ -37,7 +36,7 @@ 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 virtual bool IsOk() const { return m_hMF != 0; } @@ -78,7 +77,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), @@ -87,6 +86,14 @@ public: int width = 0, int height = 0, const wxString& description = wxEmptyString); + // as above, but takes reference DC as first argument to take resolution, + // size, font metrics etc. from + wxEXPLICIT + 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(); @@ -102,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 @@ -129,7 +136,7 @@ public: protected: wxEnhMetaFile m_metafile; - DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject) + wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject); }; @@ -140,7 +147,7 @@ protected: // CF_ENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple { public: // ctors @@ -172,7 +179,7 @@ public: protected: wxEnhMetaFile m_metafile; - DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject) + wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject); }; #endif // wxUSE_DRAG_AND_DROP