Compilation fixes

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 3c4773b05afcf419625cdbdd2f90be1067ad03a4..2373f52df601c241a2a7294747798840594b2add 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -18,14 +18,11 @@
 #pragma interface "confbase.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// compile options
-// ----------------------------------------------------------------------------
+#include "wx/defs.h"
+
+#ifdef wxUSE_CONFIG
 
-// it won't compile without it anyhow
-#ifndef wxUSE_CONFIG
-  #error "Please define wxUSE_CONFIG or remove config.cpp from your makefile"
-#endif // wxUSE_CONFIG
+#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -287,7 +284,10 @@ private:
   #define sm_classwxConfig sm_classwxFileConfig
 #endif
 
+#endif 
+ 
+  // wxUSE_CONFIG
 
-
-#endif  // _WX_CONFIG_H_
+#endif
+  // _WX_CONFIG_H_