X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35c265988485487c24c341fd270bd3faac4f6eb..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/gtk1/font.h diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index 54e6d5da15..ed7ac95c86 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -14,11 +14,7 @@ #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 // ---------------------------------------------------------------------------- @@ -46,9 +36,15 @@ public: // ctors and such wxFont() { Init(); } wxFont(const wxFont& font) { Init(); Ref(font); } + wxFont(const wxString& fontname, + wxFontEncoding fontenc = wxFONTENCODING_DEFAULT) + { + Init(); - // assignment - wxFont& operator=(const wxFont& font); + Create(fontname, fontenc); + } + + wxFont(const wxNativeFontInfo& info); wxFont(int size, int family, @@ -71,8 +67,16 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + // wxGTK-specific + bool Create(const wxString& fontname, + wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); + bool Create(const wxNativeFontInfo& fontinfo); + ~wxFont(); + // assignment + wxFont& operator=(const wxFont& font); + // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -81,6 +85,7 @@ public: virtual wxString GetFaceName() const; virtual bool GetUnderlined() const; virtual wxFontEncoding GetEncoding() const; + virtual wxNativeFontInfo *GetNativeFontInfo() const; virtual void SetPointSize( int pointSize ); virtual void SetFamily( int family ); @@ -89,9 +94,9 @@ public: virtual void SetFaceName( const wxString& faceName ); virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); + virtual void SetNativeFontInfo( const wxNativeFontInfo& info ); // implementation from now on - wxFont( GdkFont* font, char *xFontName ); void Unshare(); GdkFont* GetInternalFont(float scale = 1.0) const;