X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df455719ff6891112733200ff533109c34d184e0..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/msw/font.h diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 5b05caf5d5..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,11 +12,7 @@ #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 @@ -26,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, @@ -37,8 +32,6 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } @@ -50,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); } @@ -93,8 +82,9 @@ 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; @@ -113,7 +103,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); @@ -130,11 +120,6 @@ public: // 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 +134,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 wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif - // _WX_FONT_H_ +#endif // _WX_FONT_H_