X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9045ad9dfc9d205ad645e6d496bec9ccddd91ced..2c990ba6d4f88e18e6666f61efe55c7a8b5cc948:/include/wx/msw/font.h diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index b1d31e2fb1..13674e03c5 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/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 @@ -72,7 +72,7 @@ public: virtual bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; - virtual wxNativeFontInfo* GetNativeFontInfo() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual void SetPointSize(int pointSize); virtual void SetFamily(int family);