X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23d2edff3505385801313910ece449bdb959f0f1..222ed1d678dff2f5c3c4164321dd05e8f47de487:/include/wx/font.h?ds=sidebyside diff --git a/include/wx/font.h b/include/wx/font.h index 68799b2c5b..e1c2c1044a 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -6,7 +6,7 @@ // Created: 20.09.99 // RCS-ID: $Id$ // Copyright: (c) wxWindows team -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FONT_H_BASE_ @@ -171,7 +171,8 @@ public: virtual void SetFaceName( const wxString& faceName ) = 0; virtual void SetUnderlined( bool underlined ) = 0; virtual void SetEncoding(wxFontEncoding encoding) = 0; - virtual void SetNativeFontInfo(const wxNativeFontInfo& info); + void SetNativeFontInfo(const wxNativeFontInfo& info) + { DoSetNativeFontInfo(info); } void SetNativeFontInfo(const wxString& info); void SetNativeFontInfoUserDesc(const wxString& info); @@ -195,7 +196,10 @@ protected: // get the internal data wxFontRefData *GetFontData() const { return (wxFontRefData *)m_refData; } - + + // the function called by both overloads of SetNativeFontInfo() + virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); + private: // the currently default encoding: by default, it's the default system // encoding, but may be changed by the application using @@ -217,6 +221,8 @@ private: #include "wx/mgl/font.h" #elif defined(__WXMAC__) #include "wx/mac/font.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/font.h" #elif defined(__WXPM__) #include "wx/os2/font.h" #endif