X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7826e2dd838d59c6a8061b4fdd9f7326a6e06de3..01cb1c26171efc494b94d77e4351362bb0eb2e7d:/include/wx/gtk1/font.h

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index ed7ac95c86..9311e7d115 100644
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -10,7 +10,7 @@
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface
 #endif
 
@@ -35,13 +35,14 @@ class wxFont : public wxFontBase
 public:
     // ctors and such
     wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
-    wxFont(const wxString& fontname,
-           wxFontEncoding fontenc = wxFONTENCODING_DEFAULT)
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
+
+    // wxGTK-specific
+    wxFont(const wxString& fontname)
     {
         Init();
 
-        Create(fontname, fontenc);
+        Create(fontname);
     }
 
     wxFont(const wxNativeFontInfo& info);
@@ -68,9 +69,7 @@ public:
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     // wxGTK-specific
-    bool Create(const wxString& fontname,
-                wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
-    bool Create(const wxNativeFontInfo& fontinfo);
+    bool Create(const wxString& fontname);
 
     ~wxFont();
 
@@ -86,6 +85,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );
     virtual void SetFamily( int family );