X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..f7040b5fe68379e9bc7824aaffa834ae146c4084:/include/wx/motif/font.h

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 80d1a4f841..d49232e51d 100644
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -16,10 +16,16 @@
 #pragma interface "font.h"
 #endif
 
+#if __WXMOTIF20__ && !__WXLESSTIF__
+    #define wxMOTIF_NEW_FONT_HANDLING 0 // safe default, change to 1 to enable
+#else
+    #define wxMOTIF_NEW_FONT_HANDLING 0
+#endif
+
 class wxXFont;
 
 // Font
-class wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
     // ctors and such
@@ -30,7 +36,7 @@ public:
         int family,
         int style,
         int weight,
-        bool underlined = FALSE,
+        bool underlined = false,
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
@@ -45,7 +51,7 @@ public:
         int family,
         int style,
         int weight,
-        bool underlined = FALSE,
+        bool underlined = false,
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
@@ -95,16 +101,22 @@ public:
         WXDisplay* display = NULL) const;
 
     // These two are helper functions for convenient access of the above.
+#if !wxMOTIF_NEW_FONT_HANDLING
     WXFontStructPtr GetFontStruct(double scale = 1.0,
         WXDisplay* display = NULL) const;
     WXFontList GetFontList(double scale = 1.0,
         WXDisplay* display = NULL) const;
-#if __WXMOTIF20__
+#else
+    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
+#endif
+#if __WXMOTIF20__ // && !__WXLESSTIF__ for 2.7
     WXRenderTable GetRenderTable(WXDisplay* display) const;
 #endif
-    // returns either a XmFontList or XmRendition, depending
+    // 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 );
@@ -113,7 +125,7 @@ protected:
     void Init();
 
     // VZ: IMHO, we don't need it at all...
-    bool RealizeResource() { return TRUE; }
+    bool RealizeResource() { return true; }
     void Unshare();
 
 private: