From 7a8cfc796494618c9b44ef8043cfa00c09f7beda Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Dec 2014 14:17:46 +0000 Subject: [PATCH] Fix handling of fast clicks in wxRibbonBar under MSW. Second click can result in a double click event instead of the usual simple click if it happens quickly enough after the first one, so handle double clicks in the same way as simple clicks instead of ignoring them. Closes #16551. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/ribbon/buttonbar.cpp | 1 + src/ribbon/toolbar.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 83e2464006..2eed312fea 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -582,6 +582,7 @@ All (GUI): - Fix several floating point rounding bugs in wxPropertyGrid (Artur Wieczorek). - Restore support for wxFD_OVERWRITE_PROMPT and wxFD_FILE_MUST_EXIST in wxGenericFileDialog which was accidentally lost some time ago (Carl Godkin). +- Fix handling of fast consecutive clicks in wxRibbonBar (atobi). wxGTK: diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp index 39e4c4f247..74fbeae690 100644 --- a/src/ribbon/buttonbar.cpp +++ b/src/ribbon/buttonbar.cpp @@ -42,6 +42,7 @@ BEGIN_EVENT_TABLE(wxRibbonButtonBar, wxRibbonControl) EVT_PAINT(wxRibbonButtonBar::OnPaint) EVT_SIZE(wxRibbonButtonBar::OnSize) EVT_LEFT_DOWN(wxRibbonButtonBar::OnMouseDown) + EVT_LEFT_DCLICK(wxRibbonButtonBar::OnMouseDown) EVT_LEFT_UP(wxRibbonButtonBar::OnMouseUp) END_EVENT_TABLE() diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp index fe337405f4..29f6fb179d 100644 --- a/src/ribbon/toolbar.cpp +++ b/src/ribbon/toolbar.cpp @@ -67,6 +67,7 @@ BEGIN_EVENT_TABLE(wxRibbonToolBar, wxRibbonControl) EVT_ERASE_BACKGROUND(wxRibbonToolBar::OnEraseBackground) EVT_LEAVE_WINDOW(wxRibbonToolBar::OnMouseLeave) EVT_LEFT_DOWN(wxRibbonToolBar::OnMouseDown) + EVT_LEFT_DCLICK(wxRibbonToolBar::OnMouseDown) EVT_LEFT_UP(wxRibbonToolBar::OnMouseUp) EVT_MOTION(wxRibbonToolBar::OnMouseMove) EVT_PAINT(wxRibbonToolBar::OnPaint)