X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34c2c1a1d921e477113fc200489c394ec429dfb1..79dbea214678efdf41577c758f49c3275a980733:/include/wx/fontutil.h diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index c7eb9060ea..56099b4758 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,8 +27,7 @@ #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; @@ -136,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(); @@ -220,10 +236,4 @@ extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info); #include "wx/mgl/fontutil.h" #endif // __WXMGL__ -#ifdef __WXMAC__ - -wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ; -wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ; - -#endif #endif // _WX_FONTUTIL_H_