From 307c2b253f0c83ad67e92e8f453b346723d7f208 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 7 Aug 2008 15:58:51 +0000 Subject: [PATCH] Fixed scrolling problem where scrollbar was taken to be a valid child window git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 2 ++ src/generic/scrlwing.cpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index bd03e5344d..80dd4c7cfd 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -145,6 +145,8 @@ wxGTK: wxMac: +- Fixed a glitch where clicking on a scrollbar (but not moving the scrollbar) + would cause the window to scroll. 2.8.8 ----- diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index e39d095980..6078d93815 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -1352,6 +1352,11 @@ void wxScrollHelper::HandleOnChildFocus(wxChildFocusEvent& event) if ( win == m_targetWindow ) return; // nothing to do +#ifdef __WXMAC__ + if (wxDynamicCast(win, wxScrollBar)) + return; +#endif + // Fixing ticket: http://trac.wxwidgets.org/ticket/9563 // When a child inside a wxControlContainer receives a focus, the // wxControlContainer generates an artificial wxChildFocusEvent for