X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/511ac294daea69d4bae9644db2fb272c712e059c..c26dba42b75b2c19df5834417ffbe330bc375b20:/include/wx/os2/font.h diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h index a306601251..11792862cf 100644 --- a/include/wx/os2/font.h +++ b/include/wx/os2/font.h @@ -14,7 +14,6 @@ #include "wx/gdiobj.h" #include "wx/os2/private.h" -#include "wx/fontutil.h" WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; @@ -93,7 +92,7 @@ public: virtual bool GetUnderlined(void) const; virtual wxString GetFaceName(void) const; virtual wxFontEncoding GetEncoding(void) const; - virtual wxNativeFontInfo* GetNativeFontInfo() const; + virtual const wxNativeFontInfo* GetNativeFontInfo() const; virtual void SetPointSize(int nPointSize); virtual void SetFamily(int nFamily); @@ -102,7 +101,6 @@ public: virtual void SetFaceName(const wxString& rsFaceName); virtual void SetUnderlined(bool bUnderlined); virtual void SetEncoding(wxFontEncoding vEncoding); - virtual void SetNativeFontInfo(const wxNativeFontInfo& rInfo); // // For internal use only! @@ -121,7 +119,10 @@ public: virtual bool FreeResource(bool bForce = FALSE); WXHFONT GetHFONT(void) const; + protected: + virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo); + // // Common part of all ctors //