X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6164d85e896743b16a0cf8b0610f5d17ceb47f36..9a29912f608e082001ee53b9873323c4bcd71f21:/include/wx/confbase.h diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 2ce903fec7..3c4773b05a 100644 --- 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); // ---------------------------------------------------------------------------- -// 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 @@ -222,14 +222,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;