X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35c265988485487c24c341fd270bd3faac4f6eb..8de5b24e54bd7fec2a9e2011b2402b3f33117bd7:/include/wx/gtk1/font.h?ds=sidebyside diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index 54e6d5da15..a3daf930e3 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -3,22 +3,18 @@ // 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 -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" #include "wx/hash.h" -#include "wx/gdiobj.h" // ---------------------------------------------------------------------------- // classes @@ -30,12 +26,6 @@ class wxWindow; class wxFont; -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -extern const wxChar* wxEmptyString; - // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- @@ -45,16 +35,23 @@ class wxFont : public wxFontBase public: // ctors and such wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } + 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) { @@ -67,12 +64,18 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + // 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; @@ -81,6 +84,8 @@ public: virtual wxString GetFaceName() const; virtual bool GetUnderlined() const; virtual wxFontEncoding GetEncoding() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const; + virtual bool IsFixedWidth() const; virtual void SetPointSize( int pointSize ); virtual void SetFamily( int family ); @@ -90,15 +95,21 @@ public: virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); + virtual void SetNoAntiAliasing( bool no = true ); + virtual bool GetNoAntiAliasing(); + // implementation from now on - wxFont( GdkFont* font, char *xFontName ); 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();