Fixed to work with the new wxMacControl system.

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index de17523e9f6191c5b7d7f3fb091d54a69e1dfaa8..a3daf930e386b6e0db1d2baf9545ca0f66fd50c2 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -3,14 +3,14 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #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);
@@ -50,7 +51,7 @@ public:
            int family,
            int style,
            int weight,
-           bool underlined = FALSE,
+           bool underlined = false,
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
@@ -63,14 +64,12 @@ public:
                 int family,
                 int style,
                 int weight,
-                bool underlined = FALSE,
+                bool underlined = false,
                 const wxString& face = wxEmptyString,
                 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();
 
@@ -85,7 +84,7 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
-    virtual wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
     virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );
@@ -95,22 +94,25 @@ public:
     virtual void SetFaceName( const wxString& faceName );
     virtual void SetUnderlined( bool underlined );
     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 :-)
 
 protected:
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+
     // 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)
 };