X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98c9fc2d06dccf3c5792a99e55d1a7035a5cd67e..ad0ac642d5764497804bee2caad4fc1f20fc6cea:/include/wx/motif/font.h

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 6fd46468d3..d49232e51d 100644
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -12,12 +12,20 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#ifdef __GNUG__
-    #pragma interface "font.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#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
@@ -25,12 +33,12 @@ public:
     wxFont(const wxFont& font) { Init(); Ref(font); }
 
     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();
 
@@ -40,12 +48,17 @@ public:
     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);
+    bool Create(const wxNativeFontInfo& fontinfo);
 
     virtual ~wxFont();
 
@@ -60,6 +73,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
@@ -83,21 +97,35 @@ public:
     // of the fonts and a mapping file.
 
     // Return font struct, and optionally the Motif font list
-    class wxXFont* GetInternalFont(double scale = 1.0,
-                                   WXDisplay* display = NULL) const;
+    wxXFont *GetInternalFont(double scale = 1.0,
+        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;
+        WXDisplay* display = NULL) const;
     WXFontList GetFontList(double scale = 1.0,
-                           WXDisplay* display = NULL) const;
-
+        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
+    // 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 );
+
     // common part of all ctors
     void Init();
 
     // VZ: IMHO, we don't need it at all...
-    bool RealizeResource() { return TRUE; }
+    bool RealizeResource() { return true; }
     void Unshare();
 
 private:
@@ -105,4 +133,4 @@ private:
 };
 
 #endif
-    // _WX_FONT_H_
+// _WX_FONT_H_