fixed bug in DeleteEntry()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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:
 

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;