X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9045ad9dfc9d205ad645e6d496bec9ccddd91ced..48f7ffbe93ab587c54643e2476b0e3b0c74e1386:/include/wx/x11/font.h diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index a0850cd38f..d2ee13045a 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -12,7 +12,7 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "font.h" #endif @@ -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