X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9045ad9dfc9d205ad645e6d496bec9ccddd91ced..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/gtk/font.h?ds=sidebyside diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 04f48613d8..1502d7bf6d 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -3,14 +3,14 @@ // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKFONTH__ #define __GTKFONTH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -51,7 +51,7 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { @@ -64,7 +64,7 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); @@ -84,7 +84,7 @@ public: virtual wxString GetFaceName() const; virtual bool GetUnderlined() const; virtual wxFontEncoding GetEncoding() const; - virtual wxNativeFontInfo *GetNativeFontInfo() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual bool IsFixedWidth() const; virtual void SetPointSize( int pointSize ); @@ -95,8 +95,8 @@ public: virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); - virtual void SetNoAntiAliasing( bool no = TRUE ); - virtual bool GetNoAntiAliasing(); + virtual void SetNoAntiAliasing( bool no = true ); + virtual bool GetNoAntiAliasing() const ; // implementation from now on void Unshare();