Various changes for Salford C++, and commited fileconf.h/fileconf.cpp changes

[wxWidgets.git] / src / common / config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 2d5dde50164442167a54e54ecb1bba01db5aa62c..47cf94f498f0856c203c6e6e7a86e3c4f6e8bc39 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -19,6 +19,10 @@
 
 #include  "wx/wxprec.h"
 
+#ifndef WX_PRECOMP
+#include  "wx/wx.h"
+#endif
+
 #include  <wx/confbase.h>
 
 #ifdef wxUSE_CONFIG
@@ -27,11 +31,6 @@
   #pragma hdrstop
 #endif  //__BORLANDC__
 
-#ifndef WX_PRECOMP
-  #include  <wx/string.h>
-  #include  <wx/intl.h>
-#endif //WX_PRECOMP
-
 #include  <wx/app.h>
 #include  <wx/file.h>
 #include  <wx/log.h>
@@ -274,9 +273,9 @@ wxString wxExpandEnvVars(const wxString& str)
   {
     Bracket_None,
     Bracket_Normal  = ')',
-    Bracket_Curly   = '}',
+    Bracket_Curly   = '}'
 #ifdef  __WXMSW__
-    Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
+    ,Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
 #endif
   };
 
@@ -412,5 +411,4 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
 #endif
 
   // wxUSE_CONFIG
-  
-  
\ No newline at end of file
+