X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bf5a59b5e058bebffcf9d87f03550b4ecf93e73..13199c3dcbb708f859aeae6b480459b7b9bb9a9d:/include/wx/os2/font.h diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h index 896e5a261c..ba85180513 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; @@ -26,20 +25,17 @@ class WXDLLEXPORT wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& rFont) { Init(); Ref(rFont); } + wxFont() { } wxFont( int nSize ,int nFamily ,int nStyle ,int nWeight - ,bool bUnderlined = FALSE + ,bool bUnderlined = false ,const wxString& rsFace = wxEmptyString ,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT ) { - Init(); - (void)Create( nSize ,nFamily ,nStyle @@ -55,8 +51,6 @@ public: ) { - Init(); - (void)Create( rInfo ,hFont ); @@ -68,7 +62,7 @@ public: ,int nFamily ,int nStyle ,int nWeight - ,bool bUnderlined = FALSE + ,bool bUnderlined = false ,const wxString& rsFace = wxEmptyString ,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT ); @@ -78,11 +72,6 @@ public: virtual ~wxFont(); - // - // Assignment - // - wxFont& operator=(const wxFont& rFont); - // // Implement base class pure virtuals // @@ -117,17 +106,13 @@ 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; protected: virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo); - // - // Common part of all ctors - // - void Init(void); void Unshare(void); private: