X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5791cc7af207a74deb0bea60f99cd97429bcb8c..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/palmos/font.h?ds=inline diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h index f1d6acb4e5..407cef5d08 100644 --- a/include/wx/palmos/font.h +++ b/include/wx/palmos/font.h @@ -47,19 +47,7 @@ public: { Create(size, family, style, weight, underlined, face, encoding); } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -111,7 +99,6 @@ public: virtual int GetPointSize() const; virtual wxSize GetPixelSize() const; virtual bool IsUsingSizeInPixels() const; - virtual wxFontFamily GetFamily() const; virtual wxFontStyle GetStyle() const; virtual wxFontWeight GetWeight() const; virtual bool GetUnderlined() const; @@ -128,7 +115,7 @@ public: virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); - WXDECLARE_COMPAT_SETTERS + wxDECLARE_COMMON_FONT_METHODS(); virtual bool IsFixedWidth() const; @@ -153,6 +140,7 @@ protected: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); + virtual wxFontFamily DoGetFamily() const; // implement wxObject virtuals which are used by AllocExclusive() virtual wxGDIRefData *CreateGDIRefData() const;