X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1d63b79352db5290a9f86428d193bd6a08ef32f..f8b13b5868b380ba53a0c030d6349f72dc4a9fae:/include/wx/palmos/metafile.h?ds=inline diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h index 21f70fc0ae..ccbb807c26 100644 --- a/include/wx/palmos/metafile.h +++ b/include/wx/palmos/metafile.h @@ -12,14 +12,6 @@ #ifndef _WX_METAFIILE_H_ #define _WX_METAFIILE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "metafile.h" -#endif - -#include "wx/setup.h" - -#if wxUSE_METAFILE - #include "wx/dc.h" #include "wx/gdiobj.h" @@ -31,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; @@ -52,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 @@ -60,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()); } @@ -76,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) }; @@ -106,7 +90,7 @@ public: 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; + const wxFont *theFont = NULL, bool use16bit = FALSE) const; // Implementation wxMetafile *GetMetaFile() const { return m_metaFile; } @@ -168,7 +152,6 @@ protected: #endif // wxUSE_DRAG_AND_DROP -#endif // wxUSE_METAFILE #endif // _WX_METAFIILE_H_