X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..1c6c52fdefbee79857043cabd7e7e2f768bb09ad:/include/wx/os2/metafile.h diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 82e4ef70c8..d75be165e5 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -58,19 +58,14 @@ public: 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)); }; + 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); - - // Operators - 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; } }; class WXDLLEXPORT wxMetafileDC: public wxDC @@ -93,7 +88,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 inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }