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 1510e939a72c3c6fd3f1c00786ceca49c34cdfae..47cf94f498f0856c203c6e6e7a86e3c4f6e8bc39 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -23,20 +19,22 @@
 
 #include  "wx/wxprec.h"
 
 
 #include  "wx/wxprec.h"
 

+#ifndef WX_PRECOMP
+#include  "wx/wx.h"
+#endif
+
+#include  <wx/confbase.h>
+
+#ifdef wxUSE_CONFIG
+

 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 
 #ifdef    __BORLANDC__
   #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>
 #include  <wx/textfile.h>
 #include  <wx/app.h>
 #include  <wx/file.h>
 #include  <wx/log.h>
 #include  <wx/textfile.h>

-#include  <wx/confbase.h>

 #include  <wx/utils.h>
 
 // we must include (one of) these files for wxConfigBase::Create
 #include  <wx/utils.h>
 
 // we must include (one of) these files for wxConfigBase::Create


@@ -275,9 +273,9 @@ wxString wxExpandEnvVars(const wxString& str)
   {
     Bracket_None,
     Bracket_Normal  = ')',
   {
     Bracket_None,
     Bracket_Normal  = ')',

-    Bracket_Curly   = '}',
+    Bracket_Curly   = '}'

 #ifdef  __WXMSW__
 #ifdef  __WXMSW__

-    Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
+    ,Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)

 #endif
   };
 
 #endif
   };
 


@@ -409,3 +407,8 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
     pc++;
   }
 }
     pc++;
   }
 }

+
+#endif
+
+  // wxUSE_CONFIG
+