X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7ae4a62645d369fbd6b8b5f3f0e12ee86536da1..51181d291194b7ae616cfb17c984fd8927e4a977:/include/wx/private/fontmgr.h?ds=inline diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h index d886739ae6..c9f4395487 100644 --- a/include/wx/private/fontmgr.h +++ b/include/wx/private/fontmgr.h @@ -201,13 +201,13 @@ protected: /// wxFontMgrFontRefData implementation using wxFontsManager classes -struct wxFontMgrFontRefData : public wxObjectRefData +class wxFontMgrFontRefData : public wxGDIRefData { public: wxFontMgrFontRefData(int size = wxDEFAULT, - int family = wxDEFAULT, - int style = wxDEFAULT, - int weight = wxDEFAULT, + wxFontFamily family = wxFONTFAMILY_DEFAULT, + wxFontStyle style = wxFONTSTYLE_NORMAL, + wxFontWeight weight = wxFONTWEIGHT_NORMAL, bool underlined = false, const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); @@ -223,16 +223,16 @@ public: int GetPointSize() const { return m_info.pointSize; } wxString GetFaceName() const { return m_info.faceName; } - int GetFamily() const { return m_info.family; } - int GetStyle() const { return m_info.style; } - int GetWeight() const { return m_info.weight; } + wxFontFamily GetFamily() const { return m_info.family; } + wxFontStyle GetStyle() const { return m_info.style; } + wxFontWeight GetWeight() const { return m_info.weight; } bool GetUnderlined() const { return m_info.underlined; } wxFontEncoding GetEncoding() const { return m_info.encoding; } void SetPointSize(int pointSize); - void SetFamily(int family); - void SetStyle(int style); - void SetWeight(int weight); + void SetFamily(wxFontFamily family); + void SetStyle(wxFontStyle style); + void SetWeight(wxFontWeight weight); void SetFaceName(const wxString& faceName); void SetUnderlined(bool underlined); void SetEncoding(wxFontEncoding encoding);