X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/fontutil.h diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 5e9e14c09b..e2243613dc 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. @@ -27,10 +27,11 @@ #include "wx/font.h" // for wxFont and wxFontEncoding #if defined(__WXMSW__) - #include - #include "wx/msw/winundef.h" + #include "wx/msw/wrapwin.h" #endif +struct WXDLLEXPORT wxNativeEncodingInfo; + #if defined(_WX_X_FONTLIKE) // the symbolic names for the XLFD fields (with examples for their value) @@ -134,9 +135,36 @@ public: // default ctor (default copy ctor is ok) wxNativeFontInfo() { Init(); } +#if wxUSE_PANGO + wxNativeFontInfo(const wxNativeFontInfo& info); + ~wxNativeFontInfo(); +#endif + // reset to the default state void Init(); + // init with the parameters of the given font + void InitFromFont(const wxFont& font) + { + // translate all font parameters + SetStyle((wxFontStyle)font.GetStyle()); + SetWeight((wxFontWeight)font.GetWeight()); + SetUnderlined(font.GetUnderlined()); + SetPointSize(font.GetPointSize()); + + // set the family/facename + SetFamily((wxFontFamily)font.GetFamily()); + const wxString& facename = font.GetFaceName(); + if ( !facename.empty() ) + { + SetFaceName(facename); + } + + // deal with encoding now (it may override the font family and facename + // so do it after setting them) + SetEncoding(font.GetEncoding()); + } + // accessors and modifiers for the font elements int GetPointSize() const; wxFontStyle GetStyle() const;