X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76e23cdba3a2e58e788dd18734e7893185531a5b..ec75d791f043b3b43cac9825a2c62e9d5321e616:/include/wx/msw/font.h?ds=sidebyside diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 47454c69e9..505e9970b9 100644 --- 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); } - wxFont(const wxNativeFontInfo& info) + wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0) { Init(); - Create(info); + Create(info, hFont); } wxFont(const wxString& fontDesc); @@ -57,7 +57,7 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - bool Create(const wxNativeFontInfo& info); + bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0); virtual ~wxFont(); @@ -72,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); @@ -80,18 +81,19 @@ 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 WXHANDLE GetResourceHandle() const; 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; /*