compilation fixes after applying DECLARE_NO_COPY_CLASS() patch

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 0a2bfbb095bfb56c0484a65f4d1dfb4bc921b3da..bad03b9d6b64cd008e13e2582d7200c07f6a15b7 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -10,7 +10,7 @@
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface
 #endif
 
     #pragma interface
 #endif
 


@@ -36,12 +36,13 @@ public:
     // ctors and such
     wxFont() { Init(); }
     wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
     // 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();
 
     {
         Init();
 

-        Create(fontname, fontenc);
+        Create(fontname);

     }
 
     wxFont(const wxNativeFontInfo& info);
     }
 
     wxFont(const wxNativeFontInfo& info);


@@ -68,9 +69,7 @@ public:
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     // wxGTK-specific
                 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();
 
 
     ~wxFont();
 


@@ -86,6 +85,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual wxNativeFontInfo *GetNativeFontInfo() const;
     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 );
 
     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 SetEncoding(wxFontEncoding encoding);
     virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
 

+    virtual void SetNoAntiAliasing( bool no = TRUE );
+    virtual bool GetNoAntiAliasing();
+    

     // implementation from now on
     void Unshare();
 
     // implementation from now on
     void Unshare();