avoid a bug in Carbon headers

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index c3885bfa268c624b400b5d462aa65faf2f6f8474..2465dc3554bd4654ae689b66c81130d430fb1dc7 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -3,14 +3,14 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // 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__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 

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

     #pragma interface
 #endif
 
     #pragma interface
 #endif
 


@@ -35,11 +35,17 @@ class wxFont : public wxFontBase
 public:
     // ctors and such
     wxFont() { Init(); }
 public:
     // ctors and such
     wxFont() { Init(); }

-    wxFont(const wxFont& font) { Init(); Ref(font); }
-    wxFont(const wxString& fontname, const wxFontData& fontdata);
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }

 
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
+    // wxGTK-specific
+    wxFont(const wxString& fontname)
+    {
+        Init();
+
+        Create(fontname);
+    }
+
+    wxFont(const wxNativeFontInfo& info);

 
     wxFont(int size,
            int family,
 
     wxFont(int size,
            int family,


@@ -62,8 +68,14 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 

+    // wxGTK-specific
+    bool Create(const wxString& fontname);
+

     ~wxFont();
 
     ~wxFont();
 

+    // assignment
+    wxFont& operator=(const wxFont& font);
+

     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;


@@ -72,6 +84,8 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual wxString GetFaceName() 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 );


@@ -81,14 +95,21 @@ public:
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
 

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

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

+#ifndef __WXGTK20__

     GdkFont* GetInternalFont(float scale = 1.0) const;
     GdkFont* GetInternalFont(float scale = 1.0) const;

+#endif

 
     // no data :-)
 
 protected:
 
     // no data :-)
 
 protected:

+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();