X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b162e540e98415f8ac6bc1fd5b880e143aa85e5..968f291be6686f70b259d9449089be204e51080e:/include/wx/fontutil.h diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 1f4f5c3c34..d2491dcbc5 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -5,21 +5,17 @@ // 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. #ifndef _WX_FONTUTIL_H_ #define _WX_FONTUTIL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "fontutil.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -92,7 +88,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 +131,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(); @@ -145,7 +158,14 @@ public: SetStyle((wxFontStyle)font.GetStyle()); SetWeight((wxFontWeight)font.GetWeight()); SetUnderlined(font.GetUnderlined()); +#if defined(__WXMSW__) + if ( font.IsUsingSizeInPixels() ) + SetPixelSize(font.GetPixelSize()); + else + SetPointSize(font.GetPointSize()); +#else SetPointSize(font.GetPointSize()); +#endif // set the family/facename SetFamily((wxFontFamily)font.GetFamily()); @@ -162,6 +182,7 @@ public: // accessors and modifiers for the font elements int GetPointSize() const; + wxSize GetPixelSize() const; wxFontStyle GetStyle() const; wxFontWeight GetWeight() const; bool GetUnderlined() const; @@ -170,10 +191,11 @@ public: wxFontEncoding GetEncoding() const; void SetPointSize(int pointsize); + void SetPixelSize(const wxSize& pixelSize); void SetStyle(wxFontStyle style); void SetWeight(wxFontWeight weight); void SetUnderlined(bool underlined); - void SetFaceName(wxString facename); + void SetFaceName(const wxString& facename); void SetFamily(wxFontFamily family); void SetEncoding(wxFontEncoding encoding); @@ -194,13 +216,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); // ----------------------------------------------------------------------------