X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..c099b53353ec8c689681a1bc8f5117a584e4098d:/include/wx/palmos/font.h diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h index 024a9380f9..a800719d7c 100644 --- a/include/wx/palmos/font.h +++ b/include/wx/palmos/font.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/palmos/font.h // Purpose: wxFont class -// Author: William Osborne -// Modified by: +// Author: William Osborne - minimal working wxPalmOS port +// Modified by: Yunhui Fu // Created: 10/14/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,23 +12,19 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "font.h" -#endif - -#include +#include "wx/gdicmn.h" // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) : wxFontBase(font) { Init(); Ref(font); } + wxFont() { } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 wxFont(int size, int family, int style, @@ -37,10 +33,28 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); + (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); + } +#endif - (void)Create(size, family, style, weight, underlined, face, encoding); + wxFont(int size, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(size, family, style, weight, underlined, face, encoding); } + + bool Create(int size, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFont(const wxSize& pixelSize, int family, @@ -50,33 +64,17 @@ 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); } wxFont(const wxString& fontDesc); - bool Create(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - return DoCreate(size, wxDefaultSize, false, family, style, - weight, underlined, face, encoding); - } - bool Create(const wxSize& pixelSize, int family, int style, @@ -93,16 +91,17 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); + // wxFontBase overridden functions + virtual wxString GetNativeFontInfoDesc() const; + virtual wxString GetNativeFontInfoUserDesc() const; // implement base class pure virtuals virtual int GetPointSize() const; virtual wxSize GetPixelSize() const; virtual bool IsUsingSizeInPixels() const; - virtual int GetFamily() const; - virtual int GetStyle() const; - virtual int GetWeight() const; + virtual wxFontFamily GetFamily() const; + virtual wxFontStyle GetStyle() const; + virtual wxFontWeight GetWeight() const; virtual bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; @@ -110,13 +109,15 @@ public: virtual void SetPointSize(int pointSize); virtual void SetPixelSize(const wxSize& pixelSize); - virtual void SetFamily(int family); - virtual void SetStyle(int style); - virtual void SetWeight(int weight); - virtual void SetFaceName(const wxString& faceName); + virtual void SetFamily(wxFontFamily family); + virtual void SetStyle(wxFontStyle style); + virtual void SetWeight(wxFontWeight weight); + virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); + WXDECLARE_COMPAT_SETTERS + virtual bool IsFixedWidth() const; // implementation only from now on @@ -127,14 +128,6 @@ public: virtual WXHANDLE GetResourceHandle() const; virtual bool FreeResource(bool force = false); - // for consistency with other wxMSW classes - WXHFONT GetHFONT() const; - - /* - virtual bool UseResource(); - virtual bool ReleaseResource(); - */ - protected: // real font creation function, used in all cases bool DoCreate(int size, @@ -149,14 +142,12 @@ protected: virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); - // common part of all ctors - void Init(); - - void Unshare(); + // implement wxObject virtuals which are used by AllocExclusive() + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif - // _WX_FONT_H_ +#endif // _WX_FONT_H_