X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/563f868d3850d70d4b08afd6fa507daafb29c656..a9102b3671a45d116d781b0c8e90d2e9a84fbdcb:/include/wx/motif/font.h?ds=sidebyside

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 99d6600abb..9f84b11bda 100644
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -12,8 +12,8 @@
 #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
 
 class wxXFont;
@@ -27,12 +27,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();
 
@@ -42,18 +42,18 @@ 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);
+        wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
     bool Create(const wxNativeFontInfo& fontinfo);
-    
+
     virtual ~wxFont();
 
     // assignment
@@ -67,8 +67,8 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
-    virtual wxNativeFontInfo *GetNativeFontInfo() const;
-    
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
+
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
@@ -76,8 +76,7 @@ public:
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
-    virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
-    
+
     // Implementation
 
     // Find an existing, or create a new, XFontStruct
@@ -93,20 +92,28 @@ public:
 
     // Return font struct, and optionally the Motif font list
     wxXFont *GetInternalFont(double scale = 1.0,
-                             WXDisplay* display = NULL) const;
+        WXDisplay* display = NULL) const;
 
     // These two are helper functions for convenient access of the above.
     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;
+#if __WXMOTIF20__
+    WXRenderTable GetRenderTable(WXDisplay* display) const;
+#endif
+    // returns either a XmFontList or XmRendition, depending
+    // on Motif version
+    WXFontType GetFontType(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:
@@ -114,4 +121,4 @@ private:
 };
 
 #endif
-    // _WX_FONT_H_
+// _WX_FONT_H_