X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ac2e80ca299919ce51415cc79f6a7a4951970c5..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/gtk1/font.h diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index 1502d7bf6d..87d21b1f11 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/gtk1/font.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,43 +10,37 @@ #ifndef __GTKFONTH__ #define __GTKFONTH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface -#endif - #include "wx/hash.h" // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxWindow; +class WXDLLIMPEXP_FWD_CORE wxDC; +class WXDLLIMPEXP_FWD_CORE wxPaintDC; +class WXDLLIMPEXP_FWD_CORE wxWindow; -class wxFont; +class WXDLLIMPEXP_FWD_CORE wxFont; // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); } + wxFont() { } // wxGTK-specific wxFont(const wxString& fontname) { - Init(); - Create(fontname); } wxFont(const wxNativeFontInfo& info); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 wxFont(int size, int family, int style, @@ -55,32 +49,64 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); + (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); + } +#endif - (void)Create(size, family, style, weight, underlined, face, encoding); + wxFont(int size, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(size, family, style, weight, underlined, face, encoding); + } + + wxFont(const wxSize& pixelSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(10, family, style, weight, underlined, face, encoding); + SetPixelSize(pixelSize); + } + + wxFont(int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(pointSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + face, encoding); } bool Create(int size, - int family, - int style, - int weight, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, 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); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; - virtual int GetFamily() const; - virtual int GetStyle() const; - virtual int GetWeight() const; + virtual wxFontStyle GetStyle() const; + virtual wxFontWeight GetWeight() const; virtual wxString GetFaceName() const; virtual bool GetUnderlined() const; virtual wxFontEncoding GetEncoding() const; @@ -88,30 +114,26 @@ public: 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 void SetFamily(wxFontFamily family); + virtual void SetStyle(wxFontStyle style); + virtual void SetWeight(wxFontWeight weight); + 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 ; + wxDECLARE_COMMON_FONT_METHODS(); // 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 ); + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - // common part of all ctors - void Init(); + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); + virtual wxFontFamily DoGetFamily() const; private: DECLARE_DYNAMIC_CLASS(wxFont)