fixed passing wxCharBuffer to a vararg function (part of bug 1001166)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -608,7 +608,8 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
 | 
			
		||||
        if ( ok )
 | 
			
		||||
            bCont = GetNextKey(strKey, lIndex);
 | 
			
		||||
	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 ) {
 | 
			
		||||
        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;
 | 
			
		||||
@@ -654,7 +656,8 @@ bool wxRegKey::DeleteSelf()
 | 
			
		||||
  if ( m_strKey.IsEmpty() ||
 | 
			
		||||
       ((m_hRootKey != (WXHKEY) aStdKeys[HKCR].hkey) &&
 | 
			
		||||
        (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;
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user