X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c33c405087d33bb001be979c8bca5146f5133d48..e487524e492809638b7e335937c41fd432458a54:/include/wx/gtk1/font.h?ds=sidebyside diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index a42fc975c0..bd34c91791 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -2,8 +2,7 @@ // Name: font.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: +// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -50,7 +49,7 @@ class wxFont: public wxGDIObject public: wxFont(void); wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight, - bool underlined = FALSE, const char *Face=NULL ); + bool underlined = FALSE, const char *Face= ( const char *) NULL ); wxFont( int PointSize, const char *Face, int Family, int Style, int Weight, bool underlined = FALSE ); wxFont( const wxFont& font ); @@ -59,7 +58,7 @@ class wxFont: public wxGDIObject wxFont& operator = ( const wxFont& font ); bool operator == ( const wxFont& font ); bool operator != ( const wxFont& font ); - bool Ok(); + bool Ok() const; int GetPointSize(void) const; wxString GetFaceName(void) const; @@ -74,12 +73,8 @@ class wxFont: public wxGDIObject bool GetUnderlined(void) const; wxFont( char *xFontName ); - - private: - - friend wxDC; - friend wxPaintDC; - friend wxWindow; + + // implementation GdkFont* GetInternalFont(float scale = 1.0) const;