X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c14b6c3241d48d9cc36a2fd0aeab0ba330d96de..9330d5afb6550c058ba3381a193f2ccaa66097c4:/include/wx/msw/font.h?ds=sidebyside diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index ba22cb5cdb..afadf95e08 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -47,7 +47,7 @@ public: { Create(size, family, style, weight, underlined, face, encoding); } - + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -135,7 +135,7 @@ public: virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); - WXDECLARE_COMPAT_SETTERS + wxDECLARE_COMMON_FONT_METHODS(); virtual bool IsFixedWidth() const; @@ -155,9 +155,9 @@ protected: bool DoCreate(int size, const wxSize& pixelSize, bool sizeUsingPixels, - int family, - int style, - int weight, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT);