Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify preprocessor guards for render tables and new

Browse Source 
font handling. Remove unused method.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-09-30 09:12:58 +00:00
parent 712593b003
commit eb9d223a9a
2 changed files with 26 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/motif/font.h
View File

@@ -14,8 +14,10 @@
#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
class wxXFont;
@@ -97,17 +99,18 @@ public:
WXDisplay* display = NULL) const;
// These two are helper functions for convenient access of the above.
#if !wxMOTIF_NEW_FONT_HANDLING
#if wxMOTIF_NEW_FONT_HANDLING
WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
#else // if !wxMOTIF_NEW_FONT_HANDLING
WXFontStructPtr GetFontStruct(double scale = 1.0,
WXDisplay* display = NULL) const;
#endif // wxMOTIF_NEW_FONT_HANDLING
#if wxMOTIF_USE_RENDER_TABLE
WXRenderTable GetRenderTable(WXDisplay* display) const;
#else // if !wxMOTIF_USE_RENDER_TABLE
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;
@@ -120,8 +123,6 @@ protected:
// common part of all ctors
void Init();
// VZ: IMHO, we don't need it at all...
bool RealizeResource() { return true; }
void Unshare();
private: