X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdf7514a009227ebf09cf8e184b3d96aa33eb026..8318935126f3860a4d52d58e131af9e9bea8fc9a:/include/wx/fontutil.h diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index e2243613dc..882333fa95 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -92,7 +92,7 @@ private: inline bool HasElements() const; public: - // init the elements from an XLFD, return TRUE if ok + // init the elements from an XLFD, return true if ok bool FromXFontName(const wxString& xFontName); // return false if we were never initialized with a valid XLFD @@ -136,9 +136,21 @@ public: wxNativeFontInfo() { Init(); } #if wxUSE_PANGO - wxNativeFontInfo(const wxNativeFontInfo& info); - ~wxNativeFontInfo(); -#endif +private: + void Init(const wxNativeFontInfo& info); + void Free(); + +public: + wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); } + ~wxNativeFontInfo() { Free(); } + + wxNativeFontInfo& operator=(const wxNativeFontInfo& info) + { + Free(); + Init(info); + return *this; + } +#endif // wxUSE_PANGO // reset to the default state void Init(); @@ -199,13 +211,13 @@ public: // ---------------------------------------------------------------------------- // translate a wxFontEncoding into native encoding parameter (defined above), -// returning TRUE if an (exact) macth could be found, FALSE otherwise (without +// returning true if an (exact) macth could be found, false otherwise (without // attempting any substitutions) extern bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info); // test for the existence of the font described by this facename/encoding, -// return TRUE if such font(s) exist, FALSE otherwise +// return true if such font(s) exist, false otherwise extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info); // ----------------------------------------------------------------------------