X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6d94998fcbdb3ce60774e38c0d4b6ee20c6798..0377efa2e9cd4d6622857ce2e418ce241c791cf6:/src/msw/iniconf.cpp diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp index b49e6d9348..eca894e0db 100644 --- a/src/msw/iniconf.cpp +++ b/src/msw/iniconf.cpp @@ -2,7 +2,7 @@ // 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 @@ -21,16 +21,22 @@ #endif #ifndef WX_PRECOMP - #include - #include - #include + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/utils.h" #endif //WX_PRECOMP -#include -#include -#include +// Doesn't yet compile in Unicode mode -#include +#if wxUSE_CONFIG && !wxUSE_UNICODE + +#include "wx/dynarray.h" +#include "wx/log.h" +#include "wx/config.h" + +#include "wx/msw/iniconf.h" // _WINDOWS_ is defined when windows.h is included, // __WXMSW__ is defined for MS Windows compilation @@ -53,47 +59,43 @@ // 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, strVendor, localFilename, globalFilename, style) + +#if 0 // This is too complex for some compilers, e.g. BC++ 5.01 + : wxConfigBase((strAppName.IsEmpty() && wxTheApp) ? wxTheApp->GetAppName() + : strAppName, + strVendor.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName() + : strAppName) + : strVendor, + localFilename, globalFilename, style) +#endif { - 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); - } + if (strAppName.IsEmpty() && wxTheApp) + SetAppName(wxTheApp->GetAppName()); + if (strVendor.IsEmpty() && wxTheApp) + SetVendorName(wxTheApp->GetVendorName()); m_strLocalFilename = localFilename; if (m_strLocalFilename.IsEmpty()) { - m_strLocalFilename = GetAppName() + ".ini"; + m_strLocalFilename = GetAppName() + wxT(".ini"); } // 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(wxT('.')) == wxNOT_FOUND ) { - m_strLocalFilename << ".ini"; + m_strLocalFilename << wxT(".ini"); } // set root path - SetPath(""); + SetPath(wxT("")); } wxIniConfig::~wxIniConfig() @@ -141,7 +143,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) ); } @@ -152,7 +154,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 { @@ -183,7 +185,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; @@ -302,6 +304,7 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const return FALSE; } else { + *pstr = szBuf ; return TRUE; } } @@ -330,6 +333,7 @@ bool wxIniConfig::Read(const wxString& szKey, wxString *pstr, return FALSE; } else { + *pstr = szBuf ; return TRUE; } } @@ -353,16 +357,22 @@ 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; } + // CS : I have no idea why they should look up in win.ini + // and if at all they have to do the same procedure using the two magic numbers + // otherwise it always returns true, even if the key was not there at all +#if 0 // no, it was just returning the default value, so now look in win.ini - *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl); + *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl); return TRUE; +#endif + return FALSE ; } bool wxIniConfig::Write(const wxString& szKey, const wxString& szValue) @@ -374,7 +384,7 @@ bool wxIniConfig::Write(const wxString& szKey, const wxString& szValue) szValue, m_strLocalFilename) != 0; if ( !bOk ) - wxLogLastError("WritePrivateProfileString"); + wxLogLastError(wxT("WritePrivateProfileString")); return bOk; } @@ -401,9 +411,15 @@ bool wxIniConfig::Flush(bool /* bCurrentOnly */) 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; @@ -412,7 +428,7 @@ bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso) NULL, m_strLocalFilename) != 0; if ( !bOk ) - wxLogLastError("WritePrivateProfileString"); + wxLogLastError(wxT("WritePrivateProfileString")); return bOk; } @@ -421,13 +437,13 @@ 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; if ( !bOk ) - wxLogLastError("WritePrivateProfileString"); + wxLogLastError(wxT("WritePrivateProfileString")); return bOk; } @@ -445,9 +461,13 @@ bool wxIniConfig::DeleteAll() char szBuf[MAX_PATH]; size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf)); if ( nRc == 0 ) - wxLogLastError("GetWindowsDirectory"); + { + wxLogLastError(wxT("GetWindowsDirectory")); + } else if ( nRc > WXSIZEOF(szBuf) ) - wxFAIL_MSG("buffer is too small for Windows directory."); + { + wxFAIL_MSG(wxT("buffer is too small for Windows directory.")); + } wxString strFile = szBuf; strFile << '\\' << m_strLocalFilename; @@ -459,3 +479,18 @@ bool wxIniConfig::DeleteAll() 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; +} + +#endif + // wxUSE_CONFIG && wxUSE_UNICODE