X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/motif/font.h diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h index 7c5efaf3a3..ef259f9a55 100644 --- a/include/wx/motif/font.h +++ b/include/wx/motif/font.h @@ -1,22 +1,23 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/motif/font.h // Purpose: wxFont class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FONT_H_ #define _WX_FONT_H_ #if __WXMOTIF20__ && !__WXLESSTIF__ - #define wxMOTIF_NEW_FONT_HANDLING 1 // safe default, change to 1 to enable + #define wxMOTIF_USE_RENDER_TABLE 1 #else - #define wxMOTIF_NEW_FONT_HANDLING 0 + #define wxMOTIF_USE_RENDER_TABLE 0 #endif +#define wxMOTIF_NEW_FONT_HANDLING wxMOTIF_USE_RENDER_TABLE class wxXFont; @@ -25,31 +26,67 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } + wxFont() { } + wxFont(const wxFontInfo& info) + { + Create(info.GetPointSize(), + info.GetFamily(), + info.GetStyle(), + info.GetWeight(), + info.IsUnderlined(), + info.GetFaceName(), + info.GetEncoding()); + + if ( info.IsUsingSizeInPixels() ) + SetPixelSize(info.GetPixelSize()); + } + + wxFont(const wxNativeFontInfo& info); + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + int family, + int style, + int weight, + bool underlined = false, + 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 wxNativeFontInfo& info); + 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); + } bool Create(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // wxMOTIF-specific bool Create(const wxString& fontname, @@ -58,27 +95,25 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // 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 bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; virtual const wxNativeFontInfo *GetNativeFontInfo() 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); + wxDECLARE_COMMON_FONT_METHODS(); + // Implementation // Find an existing, or create a new, XFontStruct @@ -97,36 +132,33 @@ public: WXDisplay* display = NULL) const; // These two are helper functions for convenient access of the above. -#if !wxMOTIF_NEW_FONT_HANDLING +#if wxMOTIF_USE_RENDER_TABLE + WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const; + WXRenderTable GetRenderTable(WXDisplay* display) const; +#else // if !wxMOTIF_USE_RENDER_TABLE WXFontStructPtr GetFontStruct(double scale = 1.0, WXDisplay* display = NULL) const; WXFontList GetFontList(double scale = 1.0, WXDisplay* display = NULL) const; -#else - WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const; -#endif -#if __WXMOTIF20__ // && !__WXLESSTIF__ for 2.7 - WXRenderTable GetRenderTable(WXDisplay* display) const; -#endif +#endif // !wxMOTIF_USE_RENDER_TABLE // returns either a XmFontList or XmRenderTable, depending // on Motif version WXFontType GetFontType(WXDisplay* display) const; // like the function above but does a copy for XmFontList WXFontType GetFontTypeC(WXDisplay* display) const; static WXString GetFontTag(); + 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; - // VZ: IMHO, we don't need it at all... - bool RealizeResource() { return true; } void Unshare(); private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif -// _WX_FONT_H_ +#endif // _WX_FONT_H_