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

wxString::Right() changed to AfterLast() (config works again)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-20 14:47:59 +00:00
parent 898efd1a88
commit 08159082b5
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/config.cpp
View File

@@ -226,17 +226,20 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
const wxString& strEntry) const wxString& strEntry)
{ {
m_pContainer = (wxConfigBase *)pContainer; m_pContainer = (wxConfigBase *)pContainer;
// wxString strPath = strEntry.Before(wxCONFIG_PATH_SEPARATOR);
// the path is everything which precedes the last slash
wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR); wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
// special case of "/keyname" when there is nothing before "/" // except in the special case of "/keyname" when there is nothing before "/"
if ( strPath.IsEmpty() && ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR )) if ( strPath.IsEmpty() &&
((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
{
strPath = wxCONFIG_PATH_SEPARATOR; strPath = wxCONFIG_PATH_SEPARATOR;
}
if ( !strPath.IsEmpty() ) { if ( !strPath.IsEmpty() ) {
// do change the path // do change the path
m_bChanged = TRUE; m_bChanged = TRUE;
// m_strName = strEntry.Right(wxCONFIG_PATH_SEPARATOR);
m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR); m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
m_strOldPath = m_pContainer->GetPath(); m_strOldPath = m_pContainer->GetPath();
m_strOldPath += wxCONFIG_PATH_SEPARATOR; m_strOldPath += wxCONFIG_PATH_SEPARATOR;

2
src/msw/regconf.cpp
View File

@@ -448,7 +448,7 @@ bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)
return FALSE; return FALSE;
if ( !m_keyLocal.HasSubkeys() ) { if ( !m_keyLocal.HasSubkeys() ) {
wxString strKey = GetPath().Right(wxCONFIG_PATH_SEPARATOR); wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
SetPath(".."); // changes m_keyLocal SetPath(".."); // changes m_keyLocal
return m_keyLocal.DeleteKey(strKey); return m_keyLocal.DeleteKey(strKey);
} }