wxDirDialog now has the same ctor under all platforms and also uses the

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 12677e19d594b684b6996e0dec91edea71ad742e..06c17b10b12d366f4bb6b64e22f7ce81fad36a64 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -40,14 +40,15 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
-    wxFont(const wxNativeFontInfo& info)
+    wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
     {
         Init();
 
-        (void)Create(info.pointSize, info.family, info.style, info.weight,
-                     info.underlined, info.faceName, info.encoding);
+        Create(info, hFont);
     }
 
+    wxFont(const wxString& fontDesc);
+
     bool Create(int size,
                 int family,
                 int style,
@@ -56,6 +57,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
+
     virtual ~wxFont();
 
     // assignment
@@ -69,6 +72,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
+    virtual wxNativeFontInfo* GetNativeFontInfo() const;
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
@@ -77,11 +81,13 @@ public:
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
+    virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
+
+    virtual bool IsFixedWidth() const;
 
     // implementation only from now on
     // -------------------------------
 
-    int GetFontId() const;
     virtual bool IsFree() const;
     virtual bool RealizeResource();
     virtual WXHANDLE GetResourceHandle();