X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b162e540e98415f8ac6bc1fd5b880e143aa85e5..ba670bae4ec5b272fdf0f45bf00e194741742a7e:/include/wx/fontutil.h diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 1f4f5c3c34..882333fa95 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -5,11 +5,11 @@ // Modified by: // Created: 05.11.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// General note: this header is private to wxWindows and is not supposed to be +// General note: this header is private to wxWidgets and is not supposed to be // included by user code. The functions declared here are implemented in // msw/fontutil.cpp for Windows, unix/fontutil.cpp for GTK/Motif &c. @@ -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 @@ -135,6 +135,23 @@ public: // default ctor (default copy ctor is ok) wxNativeFontInfo() { Init(); } +#if wxUSE_PANGO +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(); @@ -194,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); // ----------------------------------------------------------------------------