Partial Watcom C++ 10.6 support added (doesn't link for some reason)

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 1b51cae5265fde8163ec58c77d2cf3b2ef1f3f8e..604e78fe363fb8c35c7fd53e5be763150eddcfa8 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -76,7 +76,7 @@ extern wxString wxExpandEnvVars(const wxString &sz);
 extern void wxSplitPath(wxArrayString& aParts, const char *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
 // classes
 //
 // wxConfig organizes the items in a tree-like structure (modeled after the


@@ -222,14 +222,14 @@ public:
 
 protected:
   static bool IsImmutable(const wxString& key)
 
 protected:
   static bool IsImmutable(const wxString& key)

-    { return key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }
+    { return !key.IsEmpty() && key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }

 
 private:
   // are we doing automatic environment variable expansion?
   bool m_bExpandEnvVars;
   // do we record default values?
   bool m_bRecordDefaults;
 
 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;
   // static variables
   static wxConfigBase *ms_pConfig;
   static bool          ms_bAutoCreate;