Switched to DECLARE_NO_COPY_CLASS

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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index 920733ed35b11c6d3684d27042d01616c8550843..70691e8afb90ac9db8ec11a9c15f1248406a64b0 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -20,8 +20,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+#if wxUSE_FONTMAP
+

 #include "wx/fontenc.h"         // for wxFontEncoding
 
 #include "wx/fontenc.h"         // for wxFontEncoding
 

+#if wxUSE_GUI
+    #include "wx/fontutil.h"    // for wxNativeEncodingInfo
+#endif // wxUSE_GUI
+

 #if wxUSE_CONFIG
     class WXDLLEXPORT wxConfigBase;
 #endif // wxUSE_CONFIG
 #if wxUSE_CONFIG
     class WXDLLEXPORT wxConfigBase;
 #endif // wxUSE_CONFIG


@@ -160,6 +166,7 @@ protected:
 #if wxUSE_CONFIG
     // config object and path (in it) to use
     wxConfigBase *m_config;
 #if wxUSE_CONFIG
     // config object and path (in it) to use
     wxConfigBase *m_config;

+    bool m_configIsDummy;

 #endif
 
     wxString  m_configRootPath;
 #endif
 
     wxString  m_configRootPath;


@@ -182,4 +189,6 @@ protected:
 // the default font mapper for wxWindows programs
 WXDLLEXPORT_DATA(extern wxFontMapper *) wxTheFontMapper;
 
 // the default font mapper for wxWindows programs
 WXDLLEXPORT_DATA(extern wxFontMapper *) wxTheFontMapper;
 

+#endif // wxUSE_FONTMAP
+

 #endif // _WX_FONTMAPPER_H_
 #endif // _WX_FONTMAPPER_H_