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

fixed variable shadowing icc warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-26 00:29:42 +00:00
parent 8226a05440
commit 4e115ed2c7
18 changed files with 161 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/generic/treectlg.cpp
View File

@@ -2696,23 +2696,23 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
wxRect ItemRect;
GetBoundingRect(m_current, ItemRect, true);
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() );
event.m_item = m_current;
wxTreeEvent eventMenu( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() );
eventMenu.m_item = m_current;
// Use the left edge, vertical middle
event.m_pointDrag = wxPoint(ItemRect.GetX(),
ItemRect.GetY() + ItemRect.GetHeight() / 2);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(),
ItemRect.GetY() + ItemRect.GetHeight() / 2);
eventMenu.SetEventObject( this );
GetEventHandler()->ProcessEvent( eventMenu );
break;
}
case ' ':
case WXK_RETURN:
if ( !event.HasModifiers() )
{
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
event.m_item = m_current;
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
wxTreeEvent eventAct( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
eventAct.m_item = m_current;
eventAct.SetEventObject( this );
GetEventHandler()->ProcessEvent( eventAct );
}
// in any case, also generate the normal key event for this key,
@@ -3179,13 +3179,13 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
}
// generate the drag end event
wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId());
wxTreeEvent eventEndDrag(wxEVT_COMMAND_TREE_END_DRAG, GetId());
event.m_item = item;
event.m_pointDrag = pt;
event.SetEventObject(this);
eventEndDrag.m_item = item;
eventEndDrag.m_pointDrag = pt;
eventEndDrag.SetEventObject(this);
(void)GetEventHandler()->ProcessEvent(event);
(void)GetEventHandler()->ProcessEvent(eventEndDrag);
m_isDragging = false;
m_dropTarget = (wxGenericTreeItem *)NULL;