X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53c5fb20edaa636b87001a0033d510ab629c3470..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/motif/font.h diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h index 0f1955b542..69f0a5cea8 100644 --- a/include/wx/motif/font.h +++ b/include/wx/motif/font.h @@ -13,10 +13,11 @@ #define _WX_FONT_H_ #if __WXMOTIF20__ && !__WXLESSTIF__ - #define wxMOTIF_NEW_FONT_HANDLING 1 + #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,8 +26,7 @@ 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, @@ -36,8 +36,6 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } @@ -58,9 +56,6 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -75,7 +70,7 @@ public: 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); @@ -97,17 +92,15 @@ 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; @@ -117,11 +110,6 @@ public: protected: virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); - // common part of all ctors - void Init(); - - // VZ: IMHO, we don't need it at all... - bool RealizeResource() { return true; } void Unshare(); private: