From f463e5c62a14f2156ceed4abd6070b48f201ec64 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 8 Feb 2009 10:32:23 +0000 Subject: [PATCH] don't reuse the double click handled in activation event handler for toggling the item [backport of r57025 from trunk] (closes #9761) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@58755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 2 ++ src/msw/treectrl.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 95deb34db9..faa079d6c5 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -155,6 +155,8 @@ wxMSW: - Automatically adjust toolbar's tool size if the provided bitmaps don't fit into the default size. - Don't generate EVT_LISTBOX_DCLICK events with incorrect indices. +- Don't reuse the double click handled by activation event handler for toggling + the item in wxTreeCtrl. wxMSW/CE: diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index ef13a3f1e8..cdcbb63a71 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -2933,11 +2933,12 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) switch ( hdr->code ) { case NM_DBLCLK: - // we translate NM_DBLCLK into ACTIVATED event, so don't interpret - // the return code of this event handler as the return value for - // NM_DBLCLK - otherwise, double clicking the item to toggle its - // expanded status would never work - *result = false; + // we translate NM_DBLCLK into ACTIVATED event and if the user + // handled the activation of the item we shouldn't proceed with + // also using the same double click for toggling the item expanded + // state -- but OTOH do let the user to expand/collapse the item by + // double clicking on it if the activation is not handled specially + *result = processed; break; case NM_RCLICK: