From ccef4c3ad16fe5bf4365569c431f1208d79eb0ef Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 6 Aug 2013 17:36:17 +0000 Subject: [PATCH] Fix column sorting UI in wxDataViewCtrl under wxOSX. Use -outlineView:didClickTableColumn: delegate method instead of mouseDownInHeaderOfTableColumn: one to ensure that: (a) We don't sort the column if it's being dragged/resized (closes #15340). (b) We sort the column on mouse up, not down (closes #15386). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 4 ++++ src/osx/cocoa/dataview.mm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index aeae63bbf..26672a0 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -575,6 +575,10 @@ wxMSW: - It is now possible to tab into radio boxes again. +wxOSX: + +- Fix column sorting UI in wxDataViewCtrl (Myrsloik). + 2.9.5: (released 2013-07-15) ---------------------------- diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 95dc057..d2d219d 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -1667,7 +1667,7 @@ outlineView:(NSOutlineView*)outlineView // // delegate methods // --(void) outlineView:(NSOutlineView*)outlineView mouseDownInHeaderOfTableColumn:(NSTableColumn*)tableColumn +-(void) outlineView:(NSOutlineView*)outlineView didClickTableColumn:(NSTableColumn*)tableColumn { wxDataViewColumn* const col([static_cast(tableColumn) getColumnPointer]); -- 2.7.4