pop the menu up on mouse down, not up (this is more common behaviour in Windows and...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 44042da02f27dde48fbc881172beb55d666eb8d7..5a8c024ac23e71e60822849e8fe05f9672cc8042 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -110,7 +110,7 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)

-    EVT_TASKBAR_RIGHT_UP     (MyTaskBarIcon::OnRButtonUp)
+    EVT_TASKBAR_RIGHT_DOWN   (MyTaskBarIcon::OnRButtonDown)

     EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)
 END_EVENT_TABLE()
 
     EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)
 END_EVENT_TABLE()
 


@@ -138,7 +138,7 @@ void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 }
 
 // Overridables
 }
 
 // Overridables

-void MyTaskBarIcon::OnRButtonUp(wxEvent&)
+void MyTaskBarIcon::OnRButtonDown(wxEvent&)

 {
     wxMenu      menu;
 
 {
     wxMenu      menu;
 

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index 24ab1de7c8fce69ebc19de0b0f64bf8f0b0d0f13..4dac05ac6573fc184e1ce602f620e8b311476eb1 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -14,7 +14,7 @@ class MyTaskBarIcon: public wxTaskBarIcon
 public:
     MyTaskBarIcon() {};
 
 public:
     MyTaskBarIcon() {};
 

-    void OnRButtonUp(wxEvent&);
+    void OnRButtonDown(wxEvent&);

     void OnLButtonDClick(wxEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnLButtonDClick(wxEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);