X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2555abd7afd7a7a6017f46dd6550d804850fb9f..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/msw/metafile.h diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index 5b40bc3441..0ef7398f88 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -12,10 +12,6 @@ #ifndef _WX_METAFIILE_H_ #define _WX_METAFIILE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "metafile.h" -#endif - #include "wx/dc.h" #include "wx/gdiobj.h" @@ -27,14 +23,14 @@ // Metafile and metafile device context classes // ---------------------------------------------------------------------------- -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(); - ~wxMetafileRefData(); + virtual ~wxMetafileRefData(); public: WXHANDLE m_metafile; @@ -48,7 +44,6 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject { public: wxMetafile(const wxString& file = wxEmptyString); - wxMetafile(const wxMetafile& metafile) { Ref(metafile); } virtual ~wxMetafile(); // After this is called, the metafile cannot be used for anything @@ -56,7 +51,8 @@ public: virtual bool SetClipboard(int width = 0, int height = 0); virtual bool Play(wxDC *dc); - bool Ok() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); }; + 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()); } @@ -72,14 +68,6 @@ public: int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; } void SetWindowsMappingMode(int mm); - // Operators - wxMetafile& operator=(const wxMetafile& metafile) - { if (*this != metafile) Ref(metafile); return *this; } - bool operator==(const wxMetafile& metafile) const - { return m_refData == metafile.m_refData; } - bool operator!=(const wxMetafile& metafile) const - { return m_refData != metafile.m_refData; } - private: DECLARE_DYNAMIC_CLASS(wxMetafile) }; @@ -100,9 +88,11 @@ public: // Should be called at end of drawing virtual wxMetafile *Close(); 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; + virtual void DoGetTextExtent(const wxString& string, + wxCoord *x, wxCoord *y, + wxCoord *descent = NULL, + wxCoord *externalLeading = NULL, + const wxFont *theFont = NULL) const; // Implementation wxMetafile *GetMetaFile() const { return m_metaFile; } @@ -111,6 +101,8 @@ public: void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; } protected: + virtual void DoGetSize(int *width, int *height) const; + int m_windowsMappingMode; wxMetafile* m_metaFile;