X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35c265988485487c24c341fd270bd3faac4f6eb..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/gtk/font.h?ds=sidebyside diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 54e6d5da15..11ceb4335f 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -3,63 +3,38 @@ // 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__ - #pragma interface -#endif - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/hash.h" -#include "wx/gdiobj.h" - -// ---------------------------------------------------------------------------- -// classes -// ---------------------------------------------------------------------------- - -class wxDC; -class wxPaintDC; -class wxWindow; - -class wxFont; - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -extern const wxChar* wxEmptyString; +#ifndef _WX_GTK_FONT_H_ +#define _WX_GTK_FONT_H_ // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: - // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } + wxFont() { } - // assignment - wxFont& operator=(const wxFont& font); + // wxGTK-specific + wxFont(const wxString& fontname) + { + 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) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } @@ -67,11 +42,14 @@ public: int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - ~wxFont(); + // wxGTK-specific + bool Create(const wxString& fontname); + + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; @@ -81,29 +59,36 @@ 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 ); virtual void SetStyle( int style ); virtual void SetWeight( int weight ); - virtual void SetFaceName( const wxString& faceName ); + virtual bool SetFaceName( const wxString& faceName ); virtual void SetUnderlined( bool underlined ); virtual void SetEncoding(wxFontEncoding encoding); + virtual void SetNoAntiAliasing( bool no = true ); + virtual bool GetNoAntiAliasing() const ; + // implementation from now on - wxFont( GdkFont* font, char *xFontName ); void Unshare(); - GdkFont* GetInternalFont(float scale = 1.0) const; - // no data :-) protected: + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); + // common part of all ctors void Init(); + virtual wxObjectRefData* CreateRefData() const; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; + private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif // __GTKFONTH__ +#endif // _WX_GTK_FONT_H_