merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
59a944cb63
commit
2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
|
|
@ -639,7 +639,7 @@ void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
|
|||
void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
|
||||
{
|
||||
TreeNode *pNode = GetNode(event);
|
||||
bool bExpanding = event.GetCode() == wxTREE_EXPAND_EXPAND;
|
||||
bool bExpanding = event.GetKeyCode() == wxTREE_EXPAND_EXPAND;
|
||||
|
||||
// expansion might take some time
|
||||
wxSetCursor(*wxHOURGLASS_CURSOR);
|
||||
|
|
@ -782,7 +782,7 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
|
|||
wxRegKey keyDst(dst->Key(), src->m_strName);
|
||||
ok = keyDst.Create(FALSE);
|
||||
if ( !ok ) {
|
||||
wxLogError(wxT("Key '%s' already exists"));
|
||||
wxLogError(wxT("Key '%s' already exists"), keyDst.GetName().c_str());
|
||||
}
|
||||
else {
|
||||
ok = key.Copy(keyDst);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue