X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..d2213b1fa58914353f076499106b1c07819926b3:/include/wx/font.h diff --git a/include/wx/font.h b/include/wx/font.h index eb6d7f8b84..a8781d4db4 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -12,7 +12,7 @@ #ifndef _WX_FONT_H_BASE_ #define _WX_FONT_H_BASE_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "fontbase.h" #endif @@ -156,7 +156,7 @@ public: virtual bool GetUnderlined() const = 0; virtual wxString GetFaceName() const = 0; virtual wxFontEncoding GetEncoding() const = 0; - virtual wxNativeFontInfo *GetNativeFontInfo() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const = 0; virtual bool IsFixedWidth() const; @@ -221,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