Applied patch [ 679397 ] remove GPL code from motif build

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index de17523e9f6191c5b7d7f3fb091d54a69e1dfaa8..d66fbe1c1c97222377a609dcba549ea5961cacf1 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/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();
 
@@ -97,10 +96,15 @@ 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();
 
+#ifndef __WXGTK20__
     GdkFont* GetInternalFont(float scale = 1.0) const;
+#endif
 
     // no data :-)
 
@@ -108,9 +112,6 @@ protected:
     // common part of all ctors
     void Init();
 
-    // do we have the XFLD for this font (or just wxWin description)?
-    inline bool HasNativeFont() const;
-
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };