X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..707c4418929f09dfd8f5fb0f0d5aec3bb0775bd8:/include/wx/motif/font.h diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h index ebb88d97b4..9f84b11bda 100644 --- a/include/wx/motif/font.h +++ b/include/wx/motif/font.h @@ -12,7 +12,7 @@ #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 @@ -30,7 +30,7 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { @@ -45,7 +45,7 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); @@ -67,7 +67,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); @@ -113,7 +113,7 @@ protected: void Init(); // VZ: IMHO, we don't need it at all... - bool RealizeResource() { return TRUE; } + bool RealizeResource() { return true; } void Unshare(); private: