removed C++ comment added by last commit

[wxWidgets.git] / include / wx / motif / font.h

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 04bf7c63cb888fe15eca27b7672c9486cf426c0e..9f84b11bda685c27b46d5e23ebe546c4ef597c81 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "font.h"
 #endif
 
@@ -30,7 +30,7 @@ public:
         int family,
         int style,
         int weight,
-        bool underlined = FALSE,
+        bool underlined = false,
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
@@ -45,7 +45,7 @@ public:
         int family,
         int style,
         int weight,
-        bool underlined = FALSE,
+        bool underlined = false,
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
@@ -67,7 +67,7 @@ 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);
@@ -99,7 +99,13 @@ public:
         WXDisplay* display = NULL) const;
     WXFontList GetFontList(double scale = 1.0,
         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 );
 
@@ -107,7 +113,7 @@ protected:
     void Init();
 
     // VZ: IMHO, we don't need it at all...
-    bool RealizeResource() { return TRUE; }
+    bool RealizeResource() { return true; }
     void Unshare();
 
 private: