#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;
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;
// common part of all ctors
void Init();
- // VZ: IMHO, we don't need it at all...
- bool RealizeResource() { return true; }
void Unshare();
private: