X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..57e2b887a0e798ab5ab2921cdeba550f322b000c:/include/wx/msw/metafile.h?ds=sidebyside diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index bbfc7c71a8..c37eefa682 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -68,12 +68,6 @@ public: int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; } void SetWindowsMappingMode(int mm); - // Operators - 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) }; @@ -94,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; }