X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7826e2dd838d59c6a8061b4fdd9f7326a6e06de3..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/font.h diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index ed7ac95c86..9f23bd9017 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/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__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -35,13 +35,14 @@ class wxFont : public wxFontBase public: // ctors and such wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } - wxFont(const wxString& fontname, - wxFontEncoding fontenc = wxFONTENCODING_DEFAULT) + wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); } + + // wxGTK-specific + wxFont(const wxString& fontname) { Init(); - Create(fontname, fontenc); + Create(fontname); } wxFont(const wxNativeFontInfo& info); @@ -68,9 +69,7 @@ public: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // wxGTK-specific - bool Create(const wxString& fontname, - wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); - bool Create(const wxNativeFontInfo& fontinfo); + bool Create(const wxString& fontname); ~wxFont(); @@ -86,6 +85,7 @@ public: virtual bool GetUnderlined() const; virtual wxFontEncoding GetEncoding() const; virtual wxNativeFontInfo *GetNativeFontInfo() const; + virtual bool IsFixedWidth() const; virtual void SetPointSize( int pointSize ); virtual void SetFamily( int family ); @@ -94,16 +94,22 @@ public: virtual void SetFaceName( const wxString& faceName ); virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); - virtual void SetNativeFontInfo( const wxNativeFontInfo& info ); + + virtual void SetNoAntiAliasing( bool no = TRUE ); + virtual bool GetNoAntiAliasing(); // implementation from now on void Unshare(); +#ifndef __WXGTK20__ GdkFont* GetInternalFont(float scale = 1.0) const; +#endif // no data :-) protected: + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); + // common part of all ctors void Init();