X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/metafile.h?ds=sidebyside diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 996c190f83..55cf236972 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -15,9 +15,6 @@ #ifndef _WX_METAFIILE_H_ #define _WX_METAFIILE_H_ -#include "wx/setup.h" - -#if wxUSE_METAFILE #include "wx/dc.h" #include "wx/gdiobj.h" @@ -33,14 +30,14 @@ #define wxMetaFile wxMetafile #define wxMetaFileDC wxMetafileDC -class WXDLLEXPORT wxMetafile; +class WXDLLIMPEXP_FWD_CORE wxMetafile; class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxMetafile; + friend class WXDLLIMPEXP_FWD_CORE wxMetafile; public: wxMetafileRefData(void); - ~wxMetafileRefData(void); + virtual ~wxMetafileRefData(void); public: WXHANDLE m_metafile; @@ -51,81 +48,71 @@ public: class WXDLLEXPORT wxMetafile: public wxGDIObject { - DECLARE_DYNAMIC_CLASS(wxMetafile) - public: - // Copy constructor - inline wxMetafile(const wxMetafile& metafile) - { Ref(metafile); } - - wxMetafile(const wxString& file = ""); - ~wxMetafile(void); - - // After this is called, the metafile cannot be used for anything - // since it is now owned by the clipboard. - virtual bool SetClipboard(int width = 0, int height = 0); - - virtual bool Play(wxDC *dc); - inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; - - // Implementation - inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; } - void SetHMETAFILE(WXHANDLE mf) ; - inline int GetWindowsMappingMode(void) { return M_METAFILEDATA->m_windowsMappingMode; } - void SetWindowsMappingMode(int mm); - - // Operators - inline wxMetafile& operator = (const wxMetafile& metafile) - { if (*this == metafile) return (*this); Ref(metafile); return *this; } - inline bool operator== (const wxMetafile& metafile) const - { return m_refData == metafile.m_refData; } - inline bool operator!= (const wxMetafile& metafile) const - { return m_refData != metafile.m_refData; } - -protected: + DECLARE_DYNAMIC_CLASS(wxMetafile) +public: + wxMetafile(const wxString& file = wxEmptyString); + virtual ~wxMetafile(void); + + // After this is called, the metafile cannot be used for anything + // since it is now owned by the clipboard. + virtual bool SetClipboard(int width = 0, int height = 0); + + virtual bool Play(wxDC *dc); + inline bool Ok() const { return IsOk(); } + inline bool IsOk(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; + + // Implementation + inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; } + void SetHMETAFILE(WXHANDLE mf) ; + inline int GetWindowsMappingMode(void) { return M_METAFILEDATA->m_windowsMappingMode; } + void SetWindowsMappingMode(int mm); }; class WXDLLEXPORT wxMetafileDC: public wxDC { - DECLARE_DYNAMIC_CLASS(wxMetafileDC) + DECLARE_DYNAMIC_CLASS(wxMetafileDC) - public: - // Don't supply origin and extent - // Supply them to wxMakeMetaFilePlaceable instead. - wxMetafileDC(const wxString& file = ""); +public: + // Don't supply origin and extent + // Supply them to wxMakeMetaFilePlaceable instead. + wxMetafileDC(const wxString& file = wxEmptyString); - // 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); + // 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); - ~wxMetafileDC(void); + virtual ~wxMetafileDC(void); - // Should be called at end of drawing - virtual wxMetafile *Close(void); - virtual void SetMapMode(int mode); - virtual void GetTextExtent(const wxString& string, long *x, long *y, - long *descent = NULL, long *externalLeading = NULL, - wxFont *theFont = NULL, bool use16bit = FALSE) const; + // Should be called at end of drawing + virtual wxMetafile *Close(void); + virtual void SetMapMode(int mode); + virtual void GetTextExtent(const wxString& string, long *x, long *y, + long *descent = NULL, long *externalLeading = NULL, + const wxFont *theFont = NULL, bool use16bit = false) const; - // Implementation - inline wxMetafile *GetMetaFile(void) const { return m_metaFile; } - inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } - inline int GetWindowsMappingMode(void) const { return m_windowsMappingMode; } - inline void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; } + // Implementation + inline wxMetafile *GetMetaFile(void) const { return m_metaFile; } + inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } + inline int GetWindowsMappingMode(void) const { return m_windowsMappingMode; } + inline void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; } protected: - int m_windowsMappingMode; - wxMetafile* m_metaFile; + int m_windowsMappingMode; + wxMetafile* m_metaFile; private: - // function hiding warning supression - inline virtual void GetTextExtent( const wxString& string - ,long* width - ,long* height - ,long* descent = NULL - ,long* externalLeading = NULL - ,wxFont* theFont = NULL - ) const - { GetTextExtent( string, width, height, descent, externalLeading, theFont, FALSE);}; +#ifndef __WATCOMC__ + // function hiding warning supression + // still required ?? + inline virtual void GetTextExtent( const wxString& string + ,long* width + ,long* height + ,long* descent = NULL + ,long* externalLeading = NULL + ,wxFont* theFont = NULL + ) const + { GetTextExtent( string, width, height, descent, externalLeading, theFont, false);}; +#endif }; /* @@ -140,7 +127,14 @@ private: bool WXDLLEXPORT 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 WXDLLEXPORT 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 @@ -153,39 +147,39 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y class WXDLLEXPORT wxMetafileDataObject : public wxDataObject { public: - // ctors - wxMetafileDataObject() { m_width = 0; m_height = 0; }; - wxMetafileDataObject(const wxMetafile& metafile, int width = 0, int height = 0): - m_metafile(metafile), m_width(width), m_height(height) { } + // ctors + wxMetafileDataObject() { m_width = 0; m_height = 0; }; + wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0) + :m_metafile(metafile) + ,m_width(width) + ,m_height(height) { } - void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0) - { m_metafile = metafile; m_width = w; m_height = h; } - wxMetafile GetMetafile() const { return m_metafile; } - int GetWidth() const { return m_width; } - int GetHeight() const { return m_height; } + void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0) + { m_metafile = metafile; m_width = w; m_height = h; } + wxMetafile GetMetafile() const { return m_metafile; } + int GetWidth() const { return m_width; } + int GetHeight() const { return m_height; } - virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; } + virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; } /* ?? - // implement base class pure virtuals - virtual wxDataFormat GetPreferredFormat() const - { return (wxDataFormat) wxDataObject::Text; } - virtual bool IsSupportedFormat(wxDataFormat format) const - { return format == wxDataObject::Text || format == wxDataObject::Locale; } - virtual size_t GetDataSize() const - { return m_strText.Len() + 1; } // +1 for trailing '\0'of course - virtual void GetDataHere(void *pBuf) const - { memcpy(pBuf, m_strText.c_str(), GetDataSize()); } + // implement base class pure virtuals + virtual wxDataFormat GetPreferredFormat() const + { return (wxDataFormat) wxDataObject::Text; } + virtual bool IsSupportedFormat(wxDataFormat format) const + { return format == wxDataObject::Text || format == wxDataObject::Locale; } + virtual size_t GetDataSize() const + { return m_strText.Len() + 1; } // +1 for trailing '\0'of course + virtual void GetDataHere(void *pBuf) const + { memcpy(pBuf, m_strText.c_str(), GetDataSize()); } */ private: - wxMetafile m_metafile; - int m_width; - int m_height; + wxMetafile m_metafile; + int m_width; + int m_height; }; #endif -#endif // wxUSE_METAFILE #endif // _WX_METAFIILE_H_ -