X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a24aff654fb10971e82abccc1b56217d556d447b..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/cocoa/font.h?ds=sidebyside diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h index 8068b1e5d2..f2075fe537 100644 --- a/include/wx/cocoa/font.h +++ b/include/wx/cocoa/font.h @@ -12,7 +12,7 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "font.h" #endif @@ -27,11 +27,11 @@ public: , m_style(wxNORMAL) , m_weight(wxNORMAL) , m_underlined(FALSE) - , m_faceName("Geneva") + , m_faceName(wxT("Geneva")) , m_encoding(wxFONTENCODING_DEFAULT) { Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, - "Geneva", wxFONTENCODING_DEFAULT); + wxT("Geneva"), wxFONTENCODING_DEFAULT); } wxFontRefData(const wxFontRefData& data) @@ -152,6 +152,7 @@ public: virtual bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual void SetPointSize(int pointSize); virtual void SetFamily(int family);