X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/563f868d3850d70d4b08afd6fa507daafb29c656..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/motif/font.h diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h index 99d6600abb..69f0a5cea8 100644 --- a/include/wx/motif/font.h +++ b/include/wx/motif/font.h @@ -1,63 +1,60 @@ ///////////////////////////////////////////////////////////////////////////// -// 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_ -#ifdef __GNUG__ - #pragma interface "font.h" +#if __WXMOTIF20__ && !__WXLESSTIF__ + #define wxMOTIF_USE_RENDER_TABLE 1 +#else + #define wxMOTIF_USE_RENDER_TABLE 0 #endif +#define wxMOTIF_NEW_FONT_HANDLING wxMOTIF_USE_RENDER_TABLE class wxXFont; // Font -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } + wxFont() { } 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, family, style, weight, underlined, face, encoding); } wxFont(const wxNativeFontInfo& info); bool Create(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); // wxMOTIF-specific bool Create(const wxString& fontname, - wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); + wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); bool Create(const wxNativeFontInfo& fontinfo); - - virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; @@ -67,17 +64,16 @@ public: virtual bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; - virtual wxNativeFontInfo *GetNativeFontInfo() 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 bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); - virtual void SetNativeFontInfo( const wxNativeFontInfo& info ); - + // Implementation // Find an existing, or create a new, XFontStruct @@ -93,20 +89,27 @@ public: // Return font struct, and optionally the Motif font list wxXFont *GetInternalFont(double scale = 1.0, - WXDisplay* display = NULL) const; + WXDisplay* display = NULL) const; // These two are helper functions for convenient access of the above. +#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; + WXDisplay* display = NULL) const; WXFontList GetFontList(double scale = 1.0, - WXDisplay* display = NULL) const; - + WXDisplay* display = NULL) const; +#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: - // common part of all ctors - void Init(); + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); - // VZ: IMHO, we don't need it at all... - bool RealizeResource() { return TRUE; } void Unshare(); private: @@ -114,4 +117,4 @@ private: }; #endif - // _WX_FONT_H_ +// _WX_FONT_H_