X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30764ab5246a5a9876d6313607da56cf1f1909d2..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/gtk/font.h

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index a15d5b5dcc..90448b3704 100644
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -35,12 +35,17 @@ class wxFont : public wxFontBase
 public:
     // ctors and such
     wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
-    wxFont(const wxString& fontname, const wxFontData& fontdata) { Create(fontname, fontdata); }
-    wxFont(const wxNativeFontInfo& info);
+    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,
@@ -61,13 +66,16 @@ public:
                 int weight,
                 bool underlined = FALSE,
                 const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT,
-                const wxNativeFontInfo& info = wxNullNativeFontInfo);
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
-    bool Create(const wxString& fontname, const wxFontData& fontdata);
+    // wxGTK-specific
+    bool Create(const wxString& fontname);
 
     ~wxFont();
 
+    // assignment
+    wxFont& operator=(const wxFont& font);
+
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
@@ -76,7 +84,8 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
-    virtual wxNativeFontInfo GetNativeFontInfo() const;
+    virtual wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );
     virtual void SetFamily( int family );