X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11c7d5b6d1cb54d5ffdc11d8ff092b41e225bfb6..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/msw/font.h

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 1ab10844bc..06c17b10b1 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -40,6 +40,15 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
+    wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+    {
+        Init();
+
+        Create(info, hFont);
+    }
+
+    wxFont(const wxString& fontDesc);
+
     bool Create(int size,
                 int family,
                 int style,
@@ -48,6 +57,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
+
     virtual ~wxFont();
 
     // assignment
@@ -61,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);
@@ -69,15 +81,22 @@ 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();
     virtual bool FreeResource(bool force = FALSE);
+
+    // for consistency with other wxMSW classes and to have a const
+    // GetResourceHandle()-like function we have a synonym for it
+    WXHFONT GetHFONT() const;
+
     /*
        virtual bool UseResource();
        virtual bool ReleaseResource();