X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74b31181b345aaaef0c967cc5707bef72ce0a405..72594e90b2da8c167ba63b89b2c168c57a19cab4:/include/wx/msw/font.h?ds=inline

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 78a836caac..8149aaa6af 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
@@ -16,10 +16,6 @@
     #pragma interface "font.h"
 #endif
 
-#include "wx/gdiobj.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -44,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,
@@ -52,6 +57,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
+
     virtual ~wxFont();
 
     // assignment
@@ -65,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);
@@ -73,6 +81,7 @@ public:
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
+    virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
 
     // implementation only from now on
     // -------------------------------
@@ -82,6 +91,11 @@ public:
     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();