Compilation fixes

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index e7ed119cb87522198632abac7a5973edbacd3c5c..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"
 
-// 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
+#ifdef wxUSE_CONFIG
+
+#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -76,7 +73,7 @@ extern wxString wxExpandEnvVars(const wxString &sz);
 extern void wxSplitPath(wxArrayString& aParts, const char *sz);
 
 // ----------------------------------------------------------------------------
-// abstract base class wxConfigBase which defines the interface for derived 
+// abstract base class wxConfigBase which defines the interface for derived
 // classes
 //
 // wxConfig organizes the items in a tree-like structure (modeled after the
@@ -208,15 +205,7 @@ public:
   void SetRecordDefaults(bool bDoIt = TRUE) { m_bRecordDefaults = bDoIt; }
   bool IsRecordingDefaults() const { return m_bRecordDefaults; }
   // does expansion only if needed
-  wxString ExpandEnvVars(const wxString& str) const
-    {
-        wxString tmp; // Required for BC++
-        if (IsExpandingEnvVars())
-            tmp = wxExpandEnvVars(str);
-        else
-            tmp = str;
-        return tmp;
-    }
+  wxString ExpandEnvVars(const wxString& str) const;
 
     // misc accessors
   inline wxString GetAppName() const { return m_appName; }
@@ -230,14 +219,18 @@ public:
 
 protected:
   static bool IsImmutable(const wxString& key)
-    { return key[0] == wxCONFIG_IMMUTABLE_PREFIX; }
+  #ifndef __WXMAC__
+    { return !key.IsEmpty() && key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }
+  #else
+    { return !key.IsEmpty() && key[0ul] == wxCONFIG_IMMUTABLE_PREFIX; }
+  #endif
 
 private:
   // are we doing automatic environment variable expansion?
   bool m_bExpandEnvVars;
   // do we record default values?
   bool m_bRecordDefaults;
-  
+
   // static variables
   static wxConfigBase *ms_pConfig;
   static bool          ms_bAutoCreate;
@@ -291,7 +284,10 @@ private:
   #define sm_classwxConfig sm_classwxFileConfig
 #endif
 
+#endif 
+ 
+  // wxUSE_CONFIG
 
-
-#endif  // _WX_CONFIG_H_
+#endif
+  // _WX_CONFIG_H_