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

fixed passing wxCharBuffer to a vararg function (part of bug 1001166)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-31 13:14:10 +00:00
parent 4b430ee141
commit 835ab90ded
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/registry.cpp
View File

@@ -608,7 +608,8 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
if ( ok ) if ( ok )
bCont = GetNextKey(strKey, lIndex); bCont = GetNextKey(strKey, lIndex);
else else
wxLogError(_("Failed to copy the registry subkey '%s' to '%s'."), GetFullName(&key), keyName.mb_str()); wxLogError(_("Failed to copy the registry subkey '%s' to '%s'."),
GetFullName(&key), keyName.c_str());
} }
@@ -629,7 +630,8 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
} }
if ( !ok ) { if ( !ok ) {
wxLogError(_("Failed to copy the contents of registry key '%s' to '%s'."), GetFullName(this), GetFullName(&keyDst)); wxLogError(_("Failed to copy the contents of registry key '%s' to '%s'."),
GetFullName(this), GetFullName(&keyDst));
} }
return ok; return ok;
@@ -654,7 +656,8 @@ bool wxRegKey::DeleteSelf()
if ( m_strKey.IsEmpty() || if ( m_strKey.IsEmpty() ||
((m_hRootKey != (WXHKEY) aStdKeys[HKCR].hkey) && ((m_hRootKey != (WXHKEY) aStdKeys[HKCR].hkey) &&
(m_strKey.Find(REG_SEPARATOR) == wxNOT_FOUND)) ) { (m_strKey.Find(REG_SEPARATOR) == wxNOT_FOUND)) ) {
wxLogError(_("Registry key '%s' is needed for normal system operation,\ndeleting it will leave your system in unusable state:\noperation aborted."), GetFullName(this)); wxLogError(_("Registry key '%s' is needed for normal system operation,\ndeleting it will leave your system in unusable state:\noperation aborted."),
GetFullName(this));
return FALSE; return FALSE;
} }