X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0089c96ecb12ae0ad48545337d2e47ce3a9f37a..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/palmos/font.h diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h index 3ec690b1e7..31fc7dba5d 100644 --- a/include/wx/palmos/font.h +++ b/include/wx/palmos/font.h @@ -22,8 +22,7 @@ class WXDLLEXPORT wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) : wxFontBase(font) { Init(); Ref(font); } + wxFont() { } wxFont(int size, int family, @@ -33,8 +32,6 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } @@ -46,16 +43,12 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(pixelSize, family, style, weight, underlined, face, encoding); } wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0) { - Init(); - Create(info, hFont); } @@ -89,9 +82,6 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; virtual wxSize GetPixelSize() const; @@ -109,7 +99,7 @@ public: virtual void SetFamily(int family); virtual void SetStyle(int style); virtual void SetWeight(int weight); - virtual void SetFaceName(const wxString& faceName); + virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); @@ -137,9 +127,6 @@ protected: virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); - // common part of all ctors - void Init(); - void Unshare(); private: