Take into account wxFONTFLAG_STRIKETHROUGH in wxGTK wxFont ctor.

[wxWidgets.git] / include / wx / msw / iniconf.h

diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index c500b2ed421017bd5781437c241fd30c0a9dc433..e65baba61da1416944847d3347658d3e74cfcd6e 100644 (file)
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/msw/iniconf.h
+// Name:        wx/msw/iniconf.h

 // Purpose:     INI-file based wxConfigBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     INI-file based wxConfigBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -12,7 +12,9 @@
 #ifndef   _WX_MSW_INICONF_H_
 #define   _WX_MSW_INICONF_H_
 
 #ifndef   _WX_MSW_INICONF_H_
 #define   _WX_MSW_INICONF_H_
 

-#if wxUSE_INICONF
+#include "wx/defs.h"
+
+#if wxUSE_CONFIG && wxUSE_INICONF

 
 // ----------------------------------------------------------------------------
 // wxIniConfig is a wxConfig implementation which uses MS Windows INI files to
 
 // ----------------------------------------------------------------------------
 // wxIniConfig is a wxConfig implementation which uses MS Windows INI files to


@@ -99,6 +101,6 @@ private:
   DECLARE_ABSTRACT_CLASS(wxIniConfig)
 };
 
   DECLARE_ABSTRACT_CLASS(wxIniConfig)
 };
 

-#endif // wxUSE_INICONF
+#endif // wxUSE_CONFIG && wxUSE_INICONF

 
 

-#endif  //_WX_MSW_INICONF_H_
+#endif // _WX_MSW_INICONF_H_