X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dabbc6a5a1795d169f26ce95927f3e4f1a5e7b7e..c3c62822fdda9d340179dec663a806e905882cc9:/include/wx/msw/font.h diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index eb54983eb6..2437e22f4a 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,9 +12,7 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "font.h" -#endif +#include "wx/gdicmn.h" // ---------------------------------------------------------------------------- // wxFont @@ -24,8 +22,7 @@ class WXDLLEXPORT wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } + wxFont() { } wxFont(int size, int family, @@ -35,15 +32,23 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } - wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 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, family, style, weight, + underlined, face, encoding); + } + wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0) + { Create(info, hFont); } @@ -55,17 +60,36 @@ public: int weight, bool underlined = false, const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + return DoCreate(size, wxDefaultSize, false, family, style, + weight, underlined, face, encoding); + } + + bool Create(const wxSize& pixelSize, + int family, + int style, + int weight, + bool underlined = false, + const wxString& face = wxEmptyString, + 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); + // 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; @@ -75,10 +99,11 @@ public: virtual const wxNativeFontInfo *GetNativeFontInfo() const; 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 bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); @@ -95,22 +120,26 @@ public: // for consistency with other wxMSW classes WXHFONT GetHFONT() const; - /* - virtual bool UseResource(); - virtual bool ReleaseResource(); - */ - protected: - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); + // real font creation function, used in all cases + bool DoCreate(int size, + const wxSize& pixelSize, + bool sizeUsingPixels, + int family, + int style, + int weight, + bool underlined = false, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - // common part of all ctors - void Init(); + virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); - void Unshare(); + // implement wxObject virtuals which are used by AllocExclusive() + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif - // _WX_FONT_H_ +#endif // _WX_FONT_H_