X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6788ecb8a99b15c454c345fb0dac9cd11a84cd6e..00e7a427a081f91b6a657d85c5ab6125fbea4d7c:/include/wx/gtk1/font.h?ds=sidebyside

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 0a2bfbb095..bad03b9d6b 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
 
@@ -36,12 +36,13 @@ public:
     // ctors and such
     wxFont() { Init(); }
     wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
-    wxFont(const wxString& fontname,
-           wxFontEncoding fontenc = wxFONTENCODING_DEFAULT)
+
+    // 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 );
@@ -96,6 +96,9 @@ public:
     virtual void SetEncoding(wxFontEncoding encoding);
     virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
 
+    virtual void SetNoAntiAliasing( bool no = TRUE );
+    virtual bool GetNoAntiAliasing();
+    
     // implementation from now on
     void Unshare();