X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1824493628261b2cb7ceceb431d85c427f1c976b..2356708db31b737c6eae53c2316b642aa5a2e68d:/src/msw/iniconf.cpp diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp index d303501597..1adae8ce22 100644 --- a/src/msw/iniconf.cpp +++ b/src/msw/iniconf.cpp @@ -2,30 +2,30 @@ // Name: src/msw/iniconf.cpp // Purpose: implementation of wxIniConfig class // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 27.07.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ +#ifdef __GNUG__ +#pragma implementation "iniconf.h" +#endif -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ +#ifdef __BORLANDC__ +#pragma hdrstop +#endif #ifndef WX_PRECOMP #include #include + #include #include + #include #endif //WX_PRECOMP #include @@ -55,31 +55,18 @@ // ctor & dtor // ---------------------------------------------------------------------------- -wxIniConfig::wxIniConfig(const wxString& strAppName, const wxString& strVendor, - const wxString& localFilename, const wxString& globalFilename, long style): - wxConfigBase(strAppName, strVendor, localFilename, globalFilename, style) +wxIniConfig::wxIniConfig(const wxString& strAppName, + const wxString& strVendor, + const wxString& localFilename, + const wxString& globalFilename, + long style) + : wxConfigBase(!strAppName && wxTheApp ? wxTheApp->GetAppName() + : strAppName, + !strVendor ? (wxTheApp ? wxTheApp->GetVendorName() + : strAppName) + : strVendor, + localFilename, globalFilename, style) { - if ( GetAppName().IsEmpty() ) - { - wxString app; - if (wxTheApp) - app = wxTheApp->GetAppName(); - wxASSERT( !app.IsEmpty() ); - SetAppName(app); - } - - // Vendor name is required in wxIniConfig. - // TODO: should it be required? Why isn't appName used instead? -- JACS - if ( GetVendorName().IsEmpty() ) - { - wxString vendor; - if (wxTheApp) - vendor = wxTheApp->GetVendorName(); - else - vendor = strAppName; - SetVendorName(vendor); - } - m_strLocalFilename = localFilename; if (m_strLocalFilename.IsEmpty()) { @@ -89,7 +76,7 @@ wxIniConfig::wxIniConfig(const wxString& strAppName, const wxString& strVendor, // append the extension if none given and it's not an absolute file name // (otherwise we assume that they know what they're doing) if ( !wxIsPathSeparator(m_strLocalFilename[0u]) && - m_strLocalFilename.Find('.') == NOT_FOUND ) + m_strLocalFilename.Find('.') == wxNOT_FOUND ) { m_strLocalFilename << ".ini"; } @@ -143,7 +130,7 @@ void wxIniConfig::SetPath(const wxString& strPath) // other functions assume that all this is true, i.e. there are no trailing // underscores at the end except if the group is the root one wxASSERT( (m_strPath.IsEmpty() || m_strPath.Last() != PATH_SEP_REPLACE) && - (m_strGroup == PATH_SEP_REPLACE || + (m_strGroup == wxString(PATH_SEP_REPLACE) || m_strGroup.Last() != PATH_SEP_REPLACE) ); } @@ -154,7 +141,7 @@ const wxString& wxIniConfig::GetPath() const // always return abs path s_str = wxCONFIG_PATH_SEPARATOR; - if ( m_strGroup == PATH_SEP_REPLACE ) { + if ( m_strGroup == wxString(PATH_SEP_REPLACE) ) { // we're at the root level, nothing to do } else { @@ -185,7 +172,7 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const { wxString strKey; - if ( m_strGroup != PATH_SEP_REPLACE ) + if ( m_strGroup != wxString(PATH_SEP_REPLACE) ) strKey << m_strGroup << PATH_SEP_REPLACE; if ( !m_strPath.IsEmpty() ) strKey << m_strPath << PATH_SEP_REPLACE; @@ -304,6 +291,7 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const return FALSE; } else { + *pstr = szBuf ; return TRUE; } } @@ -332,6 +320,7 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr, return FALSE; } else { + *pstr = szBuf ; return TRUE; } } @@ -355,7 +344,7 @@ bool wxIniConfig::Read(const wxString& szKey, long *pl) const // is it really nMagic? lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename); - if ( lVal == nMagic ) { + if ( lVal == nMagic2 ) { // the nMagic it returned was indeed read from the file *pl = lVal; return TRUE; @@ -400,12 +389,18 @@ bool wxIniConfig::Flush(bool /* bCurrentOnly */) // delete // ---------------------------------------------------------------------------- -bool wxIniConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso) +bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso) { // passing NULL as value to WritePrivateProfileString deletes the key - if ( !Write(szKey, (const char *)NULL) ) +// if ( !Write(szKey, (const char *)NULL) ) +// return FALSE; + wxConfigPathChanger path(this, szKey); + wxString strKey = GetPrivateKeyName(path.Name()); + + if (WritePrivateProfileString(m_strGroup, szKey, + (const char*) NULL, m_strLocalFilename) == 0) return FALSE; - + if ( !bGroupIfEmptyAlso || !IsEmpty() ) return TRUE; @@ -419,11 +414,11 @@ bool wxIniConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso) return bOk; } -bool wxIniConfig::DeleteGroup(const char *szKey) +bool wxIniConfig::DeleteGroup(const wxString& szKey) { wxConfigPathChanger path(this, szKey); - // passing NULL as section name to WritePrivateProfileString deletes the + // passing NULL as section name to WritePrivateProfileString deletes the // whole section according to the docs bool bOk = WritePrivateProfileString(path.Name(), NULL, NULL, m_strLocalFilename) != 0; @@ -434,6 +429,10 @@ bool wxIniConfig::DeleteGroup(const char *szKey) return bOk; } +#ifndef MAX_PATH +#define MAX_PATH 256 +#endif + bool wxIniConfig::DeleteAll() { // first delete our group in win.ini @@ -443,17 +442,33 @@ bool wxIniConfig::DeleteAll() char szBuf[MAX_PATH]; size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf)); if ( nRc == 0 ) + { wxLogLastError("GetWindowsDirectory"); + } else if ( nRc > WXSIZEOF(szBuf) ) + { wxFAIL_MSG("buffer is too small for Windows directory."); + } wxString strFile = szBuf; strFile << '\\' << m_strLocalFilename; - if ( !DeleteFile(strFile) ) { + if ( !wxRemoveFile(strFile) ) { wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str()); return FALSE; } return TRUE; } + +bool wxIniConfig::RenameEntry(const wxString& oldName, const wxString& newName) +{ + // Not implemented + return FALSE; +} + +bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName) +{ + // Not implemented + return FALSE; +}