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

Applied patch which solved conflicts between wxWidgets

Browse Source 
and GTK+'s context menu code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-01-16 15:27:15 +00:00
parent 7c2f14eeb8
commit ac103441d1
6 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/treectrl/treetest.cpp
View File

@@ -136,7 +136,6 @@ BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
EVT_TREE_ITEM_EXPANDING(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanding)
EVT_TREE_ITEM_COLLAPSED(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsed)
EVT_TREE_ITEM_COLLAPSING(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsing)
//EVT_TREE_ITEM_RIGHT_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemRightClick)
EVT_CONTEXT_MENU(MyTreeCtrl::OnContextMenu)
EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged)
@@ -1147,11 +1146,6 @@ void MyTreeCtrl::OnItemActivated(wxTreeEvent& event)
wxLogMessage(wxT("OnItemActivated"));
}
void MyTreeCtrl::OnItemRightClick(wxTreeEvent& event)
{
ShowMenu(event.GetItem(), event.GetPoint());
}
void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event)
{
wxPoint pt = event.GetPosition();