Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1017/src/gui
Modified Files:
wxFolderTree.cpp wxFolderView.cpp
Log Message:
use EVT_CONTEXT_MENU instead of EVT_RIGHT_DOWN for showing the context menu:
this allows to invoke it from keyboard (at least under Windows)
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.238
retrieving revision 1.239
diff -b -u -2 -r1.238 -r1.239
--- wxFolderTree.cpp 16 Jan 2006 20:32:27 -0000 1.238
+++ wxFolderTree.cpp 12 Feb 2006 15:20:20 -0000 1.239
@@ -349,5 +349,5 @@
void OnChar(wxKeyEvent& event);
- void OnRightDown(wxMouseEvent& event);
+ void OnContextMenu(wxContextMenuEvent& event);
#ifdef USE_MIDDLE_CLICK_HACK
void OnMiddleDown(wxMouseEvent& event);
@@ -752,5 +752,5 @@
EVT_TREE_END_DRAG(-1, wxFolderTreeImpl::OnTreeEndDrag)
- EVT_RIGHT_DOWN(wxFolderTreeImpl::OnRightDown)
+ EVT_CONTEXT_MENU(wxFolderTreeImpl::OnContextMenu)
#ifdef USE_MIDDLE_CLICK_HACK
EVT_MIDDLE_DOWN(wxFolderTreeImpl::OnMiddleDown)
@@ -2899,5 +2899,5 @@
}
-void wxFolderTreeImpl::OnRightDown(wxMouseEvent& event)
+void wxFolderTreeImpl::OnContextMenu(wxContextMenuEvent& event)
{
wxTreeItemId item;
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.672
retrieving revision 1.673
diff -b -u -2 -r1.672 -r1.673
--- wxFolderView.cpp 16 Jan 2006 20:32:27 -0000 1.672
+++ wxFolderView.cpp 12 Feb 2006 15:20:20 -0000 1.673
@@ -577,5 +577,5 @@
void OnChar(wxKeyEvent &event);
- void OnRightClick(wxMouseEvent& event);
+ void OnContextMenu(wxContextMenuEvent& event);
void OnDoubleClick(wxMouseEvent &event);
void OnMouseMove(wxMouseEvent &event);
@@ -779,5 +779,5 @@
wxFolderMenu *m_menuFolders;
- /// flag to prevent reentrancy in OnRightClick()
+ /// flag to prevent reentrancy in OnContextMenu()
bool m_isInPopupMenu;
@@ -1470,5 +1470,5 @@
EVT_MENU(-1, wxFolderListCtrl::OnCommandEvent)
- EVT_RIGHT_DOWN( wxFolderListCtrl::OnRightClick)
+ EVT_CONTEXT_MENU( wxFolderListCtrl::OnContextMenu)
EVT_LEFT_DCLICK(wxFolderListCtrl::OnDoubleClick)
EVT_MOTION(wxFolderListCtrl::OnMouseMove)
@@ -1702,5 +1702,5 @@
}
-void wxFolderListCtrl::OnRightClick(wxMouseEvent& event)
+void wxFolderListCtrl::OnContextMenu(wxContextMenuEvent& event)
{
if ( !HasFolder() )
@@ -1789,5 +1789,5 @@
m_isInPopupMenu = true;
- PopupMenu(m_menu, event.GetX(), event.GetY());
+ PopupMenu(m_menu, event.GetPosition());
m_isInPopupMenu = false;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
