Remove duplicate wxEVT_COMMAND_TEXT_ENTER generation from wxOSX/Cocoa.

[wxWidgets.git] / src / osx / cocoa / dataview.mm

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index bff2560e350192ce2876e7767d65c3e90e0b93a1..29d412a26b0356296af38b2bbecce69e0073fe41 100644 (file)
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -21,8 +21,8 @@
     #include "wx/utils.h"
 #endif
 
     #include "wx/utils.h"
 #endif
 

-#include "wx/osx/cocoa/dataview.h"

 #include "wx/osx/private.h"
 #include "wx/osx/private.h"

+#include "wx/osx/cocoa/dataview.h"

 #include "wx/renderer.h"
 
 // ============================================================================
 #include "wx/renderer.h"
 
 // ============================================================================


@@ -603,6 +603,7 @@ outlineView:(NSOutlineView*)outlineView
         ::CFRelease(osxData);
         delete dataObjects;
     }
         ::CFRelease(osxData);
         delete dataObjects;
     }

+    return dragSuccessful;

 }
 
 -(id) outlineView:(NSOutlineView*)outlineView
 }
 
 -(id) outlineView:(NSOutlineView*)outlineView


@@ -705,7 +706,7 @@ outlineView:(NSOutlineView*)outlineView
             sortingColumnPtr:dvc->GetColumn([[newDescriptor key] intValue])
             ascending:[newDescriptor ascending]] autorelease]];
     }
             sortingColumnPtr:dvc->GetColumn([[newDescriptor key] intValue])
             ascending:[newDescriptor ascending]] autorelease]];
     }

-    [[outlineView dataSource] setSortDescriptors:wxSortDescriptors];
+    [(wxCocoaOutlineDataSource*)[outlineView dataSource] setSortDescriptors:wxSortDescriptors];

 
     // send first the event to wxWidgets that the sorting has changed so that
     // the program can do special actions before the sorting actually starts:
 
     // send first the event to wxWidgets that the sorting has changed so that
     // the program can do special actions before the sorting actually starts:


@@ -1751,7 +1752,8 @@ outlineView:(NSOutlineView*)outlineView
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId());
 
     event.SetEventObject(dvc);
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId());
 
     event.SetEventObject(dvc);

-    event.SetModel      (dvc->GetModel());
+    event.SetModel(dvc->GetModel());
+    event.SetItem(dvc->GetSelection());

     dvc->GetEventHandler()->ProcessEvent(event);
 }
 
     dvc->GetEventHandler()->ProcessEvent(event);
 }
 


@@ -2067,6 +2069,22 @@ bool wxCocoaDataViewControl::AssociateModel(wxDataViewModel* model)
 //
 // selection related methods (inherited from wxDataViewWidgetImpl)
 //
 //
 // selection related methods (inherited from wxDataViewWidgetImpl)
 //

+
+wxDataViewItem wxCocoaDataViewControl::GetCurrentItem() const
+{
+    return wxDataViewItem([[m_OutlineView itemAtRow:[m_OutlineView selectedRow]] pointer]);
+}
+
+void wxCocoaDataViewControl::SetCurrentItem(const wxDataViewItem& item)
+{
+    // We can't have unselected current item in a NSTableView, as the
+    // documentation of its deselectRow method explains, the control will
+    // automatically change the current item to the closest still selected item
+    // if the current item is deselected. So we have no choice but to select
+    // the item in the same time as making it current.
+    Select(item);
+}
+

 int wxCocoaDataViewControl::GetSelections(wxDataViewItemArray& sel) const
 {
     NSIndexSet* selectedRowIndexes([m_OutlineView selectedRowIndexes]);
 int wxCocoaDataViewControl::GetSelections(wxDataViewItemArray& sel) const
 {
     NSIndexSet* selectedRowIndexes([m_OutlineView selectedRowIndexes]);


@@ -2094,7 +2112,7 @@ void wxCocoaDataViewControl::Select(const wxDataViewItem& item)
 {
     if (item.IsOk())
         [m_OutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]]]
 {
     if (item.IsOk())
         [m_OutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]]]

-            byExtendingSelection:NO];
+            byExtendingSelection:GetDataViewCtrl()->HasFlag(wxDV_MULTIPLE) ? YES : NO];

 }
 
 void wxCocoaDataViewControl::SelectAll()
 }
 
 void wxCocoaDataViewControl::SelectAll()


@@ -2935,6 +2953,18 @@ void wxDataViewColumn::SetReorderable(bool reorderable)
 {
 }
 
 {
 }
 

+void wxDataViewColumn::SetHidden(bool hidden)
+{
+    // How to set flag here?
+
+    [m_NativeDataPtr->GetNativeColumnPtr() setHidden:hidden];
+}
+
+bool wxDataViewColumn::IsHidden() const
+{
+    return [m_NativeDataPtr->GetNativeColumnPtr() isHidden];
+}
+

 void wxDataViewColumn::SetResizeable(bool resizeable)
 {
     wxDataViewColumnBase::SetResizeable(resizeable);
 void wxDataViewColumn::SetResizeable(bool resizeable)
 {
     wxDataViewColumnBase::SetResizeable(resizeable);


@@ -2946,7 +2976,12 @@ void wxDataViewColumn::SetResizeable(bool resizeable)
 
 void wxDataViewColumn::SetSortable(bool sortable)
 {
 
 void wxDataViewColumn::SetSortable(bool sortable)
 {

-    wxDataViewColumnBase::SetSortable(sortable);
+    // wxDataViewColumnBase::SetSortable(sortable);
+    // Avoid endless recursion and just set the flag here
+    if (sortable)
+        m_flags |= wxDATAVIEW_COL_SORTABLE;
+    else
+        m_flags &= ~wxDATAVIEW_COL_SORTABLE;

 }
 
 void wxDataViewColumn::SetSortOrder(bool ascending)
 }
 
 void wxDataViewColumn::SetSortOrder(bool ascending)