X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9c3992c393926560befe4e312e4b135b675297f..9d33840bab4e10d701dd36f9b8660f6a13f05afe:/interface/wx/font.h?ds=inline diff --git a/interface/wx/font.h b/interface/wx/font.h index 3e6dce7ed7..193dbaae1f 100644 --- a/interface/wx/font.h +++ b/interface/wx/font.h @@ -310,7 +310,7 @@ public: @remarks If the desired font does not exist, the closest match will be chosen. Under Windows, only scalable TrueType fonts are used. */ - wxFont(int pointSize, wxFontFamily family, int style, + wxFont(int pointSize, wxFontFamily family, wxFontStyle style, wxFontWeight weight, bool underline = false, const wxString& faceName = wxEmptyString, @@ -360,7 +360,7 @@ public: chosen. Under Windows, only scalable TrueType fonts are used. */ wxFont(const wxSize& pixelSize, wxFontFamily family, - int style, wxFontWeight weight, + wxFontStyle style, wxFontWeight weight, bool underline = false, const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); @@ -473,7 +473,7 @@ public: Using @c New() is currently the only way to directly create a font with the given size in pixels on platforms other than wxMSW. */ - static wxFont* New(int pointSize, wxFontFamily family, int style, + static wxFont* New(int pointSize, wxFontFamily family, wxFontStyle style, wxFontWeight weight, bool underline = false, const wxString& faceName = wxEmptyString, @@ -484,7 +484,7 @@ public: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); static wxFont* New(const wxSize& pixelSize, wxFontFamily family, - int style, + wxFontStyle style, wxFontWeight weight, bool underline = false, const wxString& faceName = wxEmptyString,