X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf6a063410b3fa401c913153a64f81d700fbda4..f7040b5fe68379e9bc7824aaffa834ae146c4084:/include/wx/x11/font.h diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index 05db8914e7..561f72ebae 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -12,14 +12,14 @@ #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 class wxXFont; // Font -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such @@ -71,7 +71,7 @@ public: virtual bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; - virtual wxNativeFontInfo *GetNativeFontInfo() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual bool IsFixedWidth() const; @@ -84,7 +84,7 @@ public: virtual void SetEncoding(wxFontEncoding encoding); virtual void SetNoAntiAliasing( bool no = TRUE ); - virtual bool GetNoAntiAliasing(); + virtual bool GetNoAntiAliasing() const ; // Implementation