Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 7defab993de20f0885ea3144dfa3138babc62761..7bb3859bcbc808ca372824e0bc0b3223960e0967 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -26,6 +26,11 @@
 
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 
 
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 

+#if defined(__WXMSW__)
+#include <windows.h>
+#include "wx/msw/winundef.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------


@@ -39,6 +44,8 @@ struct WXDLLEXPORT wxNativeFontInfo
 {
 #if defined(__WXGTK__)
     wxString     xFontName;
 {
 #if defined(__WXGTK__)
     wxString     xFontName;

+#elif defined(__WXMSW__)
+    LOGFONT      lf;

 #else // other platforms
     //
     //  This is a generic implementation that should work on all ports
 #else // other platforms
     //
     //  This is a generic implementation that should work on all ports


@@ -81,4 +88,12 @@ extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
     #include "wx/unix/fontutil.h"
 #endif // X || GDK
 
     #include "wx/unix/fontutil.h"
 #endif // X || GDK
 

+// ----------------------------------------------------------------------------
+// font-related functions (MGL)
+// ----------------------------------------------------------------------------
+
+#ifdef __WXMGL__
+    #include "wx/mgl/fontutil.h"
+#endif // __WXMGL__
+

 #endif // _WX_FONTUTIL_H_
 #endif // _WX_FONTUTIL_H_