Some OS/2 updates

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index a15d5b5dcc0f2d51ce59fa0f3e0c01fe09e38f5e..0a2bfbb095bfb56c0484a65f4d1dfb4bc921b3da 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -35,12 +35,16 @@ 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); }
+    wxFont(const wxString& fontname,
+           wxFontEncoding fontenc = wxFONTENCODING_DEFAULT)
+    {
+        Init();
 
-    // assignment
-    wxFont& operator=(const wxFont& font);
+        Create(fontname, fontenc);
+    }
+
+    wxFont(const wxNativeFontInfo& info);
 
     wxFont(int size,
            int family,
@@ -61,13 +65,18 @@ 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,
+                wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
+    bool Create(const wxNativeFontInfo& fontinfo);
 
     ~wxFont();
 
+    // assignment
+    wxFont& operator=(const wxFont& font);
+
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
@@ -76,7 +85,7 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
-    virtual wxNativeFontInfo GetNativeFontInfo() const;
+    virtual wxNativeFontInfo *GetNativeFontInfo() const;
 
     virtual void SetPointSize( int pointSize );
     virtual void SetFamily( int family );