X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c193821a999730fbf6a9bea83763f37daae68f1..44fd6f721ad375033b2a2b64ac5f703ac70cb8f0:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index f9e071fee3..d7e16648ff 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "confbase.h" #endif @@ -30,6 +30,7 @@ #include "wx/config.h" #include "wx/intl.h" #include "wx/log.h" +#include "wx/arrstr.h" #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) @@ -88,11 +89,7 @@ wxConfigBase *wxConfigBase::Create() if ( ms_bAutoCreate && ms_pConfig == NULL ) { ms_pConfig = #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE - #ifdef __WIN32__ new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #else //WIN16 - new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #endif #else // either we're under Unix or wish to use files even under Windows new wxFileConfig(wxTheApp->GetAppName()); #endif