Removing deprecated classes

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 12677e19d594b684b6996e0dec91edea71ad742e..b1d31e2fb1406572fc81dd3d646171c7136565fe 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);
     }
 
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 

-    wxFont(const wxNativeFontInfo& info)
+    wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)

     {
         Init();
 
     {
         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,
     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, WXHFONT hFont = 0);
+

     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);


@@ -78,17 +82,17 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 

+    virtual bool IsFixedWidth() const;
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    int GetFontId() const;

     virtual bool IsFree() const;
     virtual bool RealizeResource();
     virtual bool IsFree() const;
     virtual bool RealizeResource();

-    virtual WXHANDLE GetResourceHandle();
+    virtual WXHANDLE GetResourceHandle() const;

     virtual bool FreeResource(bool force = FALSE);
 
     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
+    // for consistency with other wxMSW classes

     WXHFONT GetHFONT() const;
 
     /*
     WXHFONT GetHFONT() const;
 
     /*


@@ -97,6 +101,8 @@ public:
      */
 
 protected:
      */
 
 protected:

+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();