X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9045ad9dfc9d205ad645e6d496bec9ccddd91ced..f014d4bf3e18198c273b3c119ad1a08d46d12c82:/include/wx/os2/font.h diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h index 53dcf28490..314d445d7b 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; @@ -33,7 +32,7 @@ public: ,int nFamily ,int nStyle ,int nWeight - ,bool bUnderlined = FALSE + ,bool bUnderlined = false ,const wxString& rsFace = wxEmptyString ,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT ) @@ -68,7 +67,7 @@ public: ,int nFamily ,int nStyle ,int nWeight - ,bool bUnderlined = FALSE + ,bool bUnderlined = false ,const wxString& rsFace = wxEmptyString ,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT ); @@ -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); @@ -117,7 +116,7 @@ public: virtual bool IsFree(void) const; virtual bool RealizeResource(void); virtual WXHANDLE GetResourceHandle(void); - virtual bool FreeResource(bool bForce = FALSE); + virtual bool FreeResource(bool bForce = false); WXHFONT GetHFONT(void) const;