Unicode fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -721,7 +721,7 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
|
|||||||
if ( !::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) )
|
if ( !::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) )
|
||||||
{
|
{
|
||||||
// it must be a new predefined format we don't know the name of
|
// it must be a new predefined format we don't know the name of
|
||||||
sprintf(s_szBuf, "unknown CF (0x%04x)", format.GetFormatId());
|
wxSprintf(s_szBuf, wxT("unknown CF (0x%04x)"), format.GetFormatId());
|
||||||
}
|
}
|
||||||
|
|
||||||
return s_szBuf;
|
return s_szBuf;
|
||||||
|
@@ -573,7 +573,7 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
|
|||||||
wxRegKey key(*this, strKey);
|
wxRegKey key(*this, strKey);
|
||||||
wxString keyName;
|
wxString keyName;
|
||||||
keyName << GetFullName(&keyDst) << REG_SEPARATOR << strKey;
|
keyName << GetFullName(&keyDst) << REG_SEPARATOR << strKey;
|
||||||
ok = key.Copy((const char*) keyName);
|
ok = key.Copy((const wxChar*) keyName);
|
||||||
|
|
||||||
if ( ok )
|
if ( ok )
|
||||||
bCont = GetNextKey(strKey, lIndex);
|
bCont = GetNextKey(strKey, lIndex);
|
||||||
|
Reference in New Issue
Block a user