X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/include/wx/os2/metafile.h diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 4e39e32276..99b81113b5 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: metafile.h +// Name: wx/os2/metafile.h // Purpose: wxMetaFile, wxMetaFileDC classes. // This probably should be restricted to Windows platforms, // but if there is an equivalent on your platform, great. @@ -82,7 +82,7 @@ public: 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, @@ -103,7 +103,7 @@ protected: private: DECLARE_CLASS(wxMetafileDCImpl) - DECLARE_NO_COPY_CLASS(wxMetafileDCImpl) + wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl); }; class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC @@ -118,10 +118,10 @@ public: // 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) - : wxDC(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(); } virtual ~wxMetafileDC(void) @@ -136,7 +136,7 @@ public: private: DECLARE_CLASS(wxMetafileDC) - DECLARE_NO_COPY_CLASS(wxMetafileDC) + wxDECLARE_NO_COPY_CLASS(wxMetafileDC); }; /* @@ -172,7 +172,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject { public: // ctors - wxMetafileDataObject() { m_width = 0; m_height = 0; }; + wxMetafileDataObject() { m_width = 0; m_height = 0; } wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0) :m_metafile(metafile) ,m_width(width)