X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30764ab5246a5a9876d6313607da56cf1f1909d2..16edee16a7c3d346b9eab1672a4c696cb0cf6e24:/include/wx/gtk/font.h diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index a15d5b5dcc..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__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -35,18 +35,23 @@ class wxFont : public wxFontBase public: // ctors and such wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } - wxFont(const wxString& fontname, const wxFontData& fontdata) { Create(fontname, fontdata); } - wxFont(const wxNativeFontInfo& info); + wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); } - // assignment - wxFont& operator=(const wxFont& font); + // wxGTK-specific + wxFont(const wxString& fontname) + { + Init(); + + Create(fontname); + } + + wxFont(const wxNativeFontInfo& info); wxFont(int size, int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { @@ -59,15 +64,18 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT, - const wxNativeFontInfo& info = wxNullNativeFontInfo); + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - bool Create(const wxString& fontname, const wxFontData& fontdata); + // wxGTK-specific + bool Create(const wxString& fontname); ~wxFont(); + // assignment + wxFont& operator=(const wxFont& font); + // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -76,7 +84,8 @@ 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 ); virtual void SetFamily( int family ); @@ -85,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() const ; // 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();