Implement monitoring of file descriptors in wxMotif event loop.

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index c619aad35e95a037f1a0b0db0a45fba4a1535a5a..d2e6fd489ccf56ad1a78b91bcef85f64eab841b5 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -32,7 +32,20 @@ public:
     // ctors and such
     wxFont() { }
 
-    // wxGTK-specific
+    wxFont(const wxFontInfo& info)
+    {
+        Create(info.GetPointSize(),
+               info.GetFamily(),
+               info.GetStyle(),
+               info.GetWeight(),
+               info.IsUnderlined(),
+               info.GetFaceName(),
+               info.GetEncoding());
+
+        if ( info.IsUsingSizeInPixels() )
+            SetPixelSize(info.GetPixelSize());
+    }
+
     wxFont(const wxString& fontname)
     {
         Create(fontname);
@@ -92,7 +105,6 @@ public:
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
-    virtual wxFontFamily GetFamily() const;
     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual wxString GetFaceName() const;
@@ -121,6 +133,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+    virtual wxFontFamily DoGetFamily() const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)