Toolbar/tooltip udates

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 47454c69e9bd8695587d3aae089959b56a5d68ef..06c17b10b12d366f4bb6b64e22f7ce81fad36a64 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -40,11 +40,11 @@ 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();
 

-        Create(info);
+        Create(info, hFont);

     }
 
     wxFont(const wxString& fontDesc);
     }
 
     wxFont(const wxString& fontDesc);


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

-    bool Create(const wxNativeFontInfo& info);
+    bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);

 
     virtual ~wxFont();
 
 
     virtual ~wxFont();
 


@@ -72,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);


@@ -80,11 +81,13 @@ 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);
+
+    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 WXHANDLE GetResourceHandle();
     virtual bool IsFree() const;
     virtual bool RealizeResource();
     virtual WXHANDLE GetResourceHandle();