diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp index 26509e0..54c829a 100644 --- a/ZRCola/zrcolaapp.cpp +++ b/ZRCola/zrcolaapp.cpp @@ -27,23 +27,23 @@ wxIMPLEMENT_APP(ZRColaApp); -ZRColaApp::ZRColaApp() : - m_config(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR)), - wxApp() +ZRColaApp::ZRColaApp() : wxApp() { } bool ZRColaApp::OnInit() { + wxConfigBase::Set(new wxConfig(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR))); + if (!wxApp::OnInit()) return false; // Set desired locale. - wxLanguage language = (wxLanguage)m_config.Read(wxT("Language"), wxLANGUAGE_DEFAULT); + wxLanguage language = (wxLanguage)wxConfigBase::Get()->Read(wxT("Language"), wxLANGUAGE_DEFAULT); if (wxLocale::IsAvailable(language)) { wxString sPath; - if (m_config.Read(wxT("LocalizationRepositoryPath"), &sPath)) + if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath)) m_locale.AddCatalogLookupPathPrefix(sPath); wxVERIFY(m_locale.Init(language)); wxVERIFY(m_locale.AddCatalog(wxT("wxExtend"))); diff --git a/ZRCola/zrcolaapp.h b/ZRCola/zrcolaapp.h index a75236f..8f03176 100644 --- a/ZRCola/zrcolaapp.h +++ b/ZRCola/zrcolaapp.h @@ -55,7 +55,6 @@ public: protected: - wxConfig m_config; ///< Application configuration wxLocale m_locale; ///< Current locale }; @@ -66,7 +65,7 @@ wxDECLARE_APP(ZRColaApp); inline wxString ZRColaApp::GetDatabasePath() const { wxString sPath; - if (m_config.Read(wxT("DatabasePath"), &sPath)) { + if (wxConfigBase::Get()->Read(wxT("DatabasePath"), &sPath)) { if (!wxEndsWithPathSeparator(sPath)) sPath << wxFILE_SEP_PATH; } else {