Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug in handling escaped chars in entries/group names corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-16 21:47:34 +00:00
parent c1b2075d92
commit 7af61b2e18
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/fileconf.cpp
View File

@@ -610,8 +610,6 @@ bool wxFileConfig::Write(const wxString& key, const wxString& szValue)
return FALSE; return FALSE;
} }
strName = FilterOutEntryName(strName);
ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strName); ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strName);
if ( pEntry == NULL ) if ( pEntry == NULL )
pEntry = m_pCurrentGroup->AddEntry(strName); pEntry = m_pCurrentGroup->AddEntry(strName);
@@ -906,7 +904,10 @@ LineList *ConfigGroup::GetGroupLine()
// this group wasn't present in local config file, add it now // this group wasn't present in local config file, add it now
if ( pParent != NULL ) { if ( pParent != NULL ) {
wxString strFullName; wxString strFullName;
strFullName << _T("[") << (GetFullName().c_str() + 1) << _T("]"); // +1: no '/' strFullName << _T("[")
// +1: no '/'
<< FilterOutEntryName(GetFullName().c_str() + 1)
<< _T("]");
m_pLine = m_pConfig->LineListInsert(strFullName, m_pLine = m_pConfig->LineListInsert(strFullName,
pParent->GetLastGroupLine()); pParent->GetLastGroupLine());
pParent->SetLastGroup(this); // we're surely after all the others pParent->SetLastGroup(this); // we're surely after all the others
@@ -1273,7 +1274,7 @@ void ConfigEntry::SetValue(const wxString& strValue, bool bUser)
if ( bUser ) { if ( bUser ) {
wxString strVal = FilterOutValue(strValue); wxString strVal = FilterOutValue(strValue);
wxString strLine; wxString strLine;
strLine << m_strName << _T(" = ") << strVal; strLine << FilterOutEntryName(m_strName) << _T(" = ") << strVal;
if ( m_pLine != NULL ) { if ( m_pLine != NULL ) {
// entry was read from the local config file, just modify the line // entry was read from the local config file, just modify the line