X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/font.h diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 505e9970b9..3f49e65e78 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/msw/font.h // Purpose: wxFont class // Author: Julian Smart // Modified by: @@ -12,76 +12,125 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#ifdef __GNUG__ - #pragma interface "font.h" -#endif +#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) { Init(); Ref(font); } + wxFont() { } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 wxFont(int size, int family, int style, int weight, - bool underlined = FALSE, + bool underlined = false, 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); } - wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0) + bool Create(int size, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + return DoCreate(size, wxDefaultSize, false, family, style, + weight, underlined, face, encoding); + } + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxFont(const wxSize& pixelSize, + int family, + int style, + int weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); + (void)Create(pixelSize, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, + underlined, face, encoding); + } +#endif + wxFont(const wxSize& pixelSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + (void)Create(pixelSize, family, style, weight, + underlined, face, encoding); + } + + wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0) + { Create(info, hFont); } wxFont(const wxString& fontDesc); - bool Create(int size, - int family, - int style, - int weight, - bool underlined = FALSE, + + bool Create(const wxSize& pixelSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + return DoCreate(-1, pixelSize, true, family, style, + weight, underlined, face, encoding); + } bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0); virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; - virtual int GetFamily() const; - virtual int GetStyle() const; - virtual int GetWeight() const; + virtual wxSize GetPixelSize() const; + virtual bool IsUsingSizeInPixels() const; + virtual wxFontStyle GetStyle() const; + virtual wxFontWeight GetWeight() const; virtual bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; - virtual wxNativeFontInfo* GetNativeFontInfo() const; + virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual void SetPointSize(int pointSize); - virtual void SetFamily(int family); - virtual void SetStyle(int style); - virtual void SetWeight(int weight); - virtual void SetFaceName(const wxString& faceName); + virtual void SetPixelSize(const wxSize& pixelSize); + 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); - virtual void SetNativeFontInfo(const wxNativeFontInfo& info); + + wxDECLARE_COMMON_FONT_METHODS(); virtual bool IsFixedWidth() const; @@ -91,25 +140,32 @@ public: virtual bool IsFree() const; virtual bool RealizeResource(); virtual WXHANDLE GetResourceHandle() const; - virtual bool FreeResource(bool force = FALSE); + virtual bool FreeResource(bool force = false); // for consistency with other wxMSW classes WXHFONT GetHFONT() const; - /* - virtual bool UseResource(); - virtual bool ReleaseResource(); - */ - protected: - // common part of all ctors - void Init(); - - void Unshare(); + // real font creation function, used in all cases + bool DoCreate(int size, + const wxSize& pixelSize, + bool sizeUsingPixels, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined = false, + const wxString& face = wxEmptyString, + 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; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif - // _WX_FONT_H_ +#endif // _WX_FONT_H_