Wrappers for *ToText

[wxWidgets.git] / include / wx / fontutil.h

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index c7eb9060ea990bf3875e54d6adb388eaae7ee8d1..e2243613dce52c980b8755ab45d90d5751b3dceb 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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.
 
 // 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 "wx/font.h"        // for wxFont and wxFontEncoding
 
 #if defined(__WXMSW__)

-    #include <windows.h>
-    #include "wx/msw/winundef.h"
+    #include "wx/msw/wrapwin.h"

 #endif
 
 struct WXDLLEXPORT wxNativeEncodingInfo;
 #endif
 
 struct WXDLLEXPORT wxNativeEncodingInfo;


@@ -136,6 +135,11 @@ public:
     // default ctor (default copy ctor is ok)
     wxNativeFontInfo() { Init(); }
 
     // 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();
 
     // reset to the default state
     void Init();
 


@@ -220,10 +224,4 @@ extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
     #include "wx/mgl/fontutil.h"
 #endif // __WXMGL__
 
     #include "wx/mgl/fontutil.h"
 #endif // __WXMGL__
 

-#ifdef __WXMAC__
-
-wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
-wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
-
-#endif

 #endif // _WX_FONTUTIL_H_
 #endif // _WX_FONTUTIL_H_