diff --git a/docs/changes.txt b/docs/changes.txt index e3a9b90961..32a113447a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -178,6 +178,15 @@ wxThread and related classes: OTHER CHANGES ============= +2.4.3 +----- + +wxMSW: + +- strip ampersands from strings returned by wxMenuBar::GetLabelTop() +- fixed bug in wxIniConfig::DeleteEntry() (Parinya Thipchart) + + 2.4.2 ----- @@ -224,7 +233,6 @@ wxMSW: - fixed release mode build with VC 7.x (Martin Ecker) - fix iostream.h problem with VC 7.1 (it doesn't support it any longer) - compilation fix for XRC with mingw32 -- strip ampersands from strings returned by wxMenuBar::GetLabelTop() wxMotif: diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp index 7bcce6e8f2..804baf73b6 100644 --- a/src/msw/iniconf.cpp +++ b/src/msw/iniconf.cpp @@ -380,12 +380,10 @@ 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) ) -// return FALSE; wxConfigPathChanger path(this, szKey); wxString strKey = GetPrivateKeyName(path.Name()); - if (WritePrivateProfileString(m_strGroup, szKey, + if (WritePrivateProfileString(m_strGroup, strKey, (const char*) NULL, m_strLocalFilename) == 0) return FALSE;