DC updates

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 12677e19d594b684b6996e0dec91edea71ad742e..90073aa564f0474fd0feadfdef9d256645dcda50 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -44,10 +44,11 @@ public:
     {
         Init();
 
     {
         Init();
 

-        (void)Create(info.pointSize, info.family, info.style, info.weight,
-                     info.underlined, info.faceName, info.encoding);
+        Create(info);

     }
 
     }
 

+    wxFont(const wxString& fontDesc);
+

     bool Create(int size,
                 int family,
                 int style,
     bool Create(int size,
                 int family,
                 int style,


@@ -56,6 +57,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 

+    bool Create(const wxNativeFontInfo& info);
+

     virtual ~wxFont();
 
     // assignment
     virtual ~wxFont();
 
     // assignment


@@ -69,6 +72,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
     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);
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);


@@ -77,6 +81,7 @@ public:
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
     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
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------