X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4c24d3da4e0b4a85ce4a5503cf401b4bdb021a5..bd235295fb3b35fdb29326084b87893cf5432eb5:/src/osx/cocoa/listbox.mm

diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index 79389e8306..e4dc3d3aa6 100644
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -33,10 +33,7 @@
 
 class wxListWidgetCocoaImpl;
 
-@interface wxNSTableDataSource : NSObject
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
-    <NSTableViewDataSource>
-#endif
+@interface wxNSTableDataSource : NSObject wxOSX_10_6_AND_LATER(<NSTableViewDataSource>)
 {
     wxListWidgetCocoaImpl* impl;
 }
@@ -56,10 +53,7 @@ class wxListWidgetCocoaImpl;
 
 @end
 
-@interface wxNSTableView : NSTableView
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
-    <NSTableViewDelegate>
-#endif
+@interface wxNSTableView : NSTableView wxOSX_10_6_AND_LATER(<NSTableViewDelegate>)
 {
 }
 
@@ -150,7 +144,6 @@ public :
     virtual void            UpdateLineToEnd( unsigned int n);
 
     virtual void            controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
-    virtual bool            DoHandleKeyEvent(NSEvent *event);
 
 protected :
     wxNSTableView*          m_tableView ;
@@ -468,7 +461,7 @@ int wxListWidgetCocoaImpl::ListGetSelections( wxArrayInt& aSelections ) const
 
     for ( int i = 0; i < count; ++i)
     {
-        if ([m_tableView isRowSelected:count])
+        if ([m_tableView isRowSelected:i])
         aSelections.Add(i);
     }
 
@@ -512,18 +505,6 @@ void wxListWidgetCocoaImpl::controlDoubleAction(WXWidget WXUNUSED(slf),void* WXU
     list->HandleLineEvent( sel, true );
 }
 
-bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
-{
-    wxKeyEvent wxevent(wxEVT_KEY_DOWN);
-    SetupKeyEvent( wxevent, event );
-    wxevent.SetEventObject(GetWXPeer());
-    bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
-
-    // no interpretKeyEvents here, but rerouting to native keyhandling
-    
-    return result;
-}
-
 // accessing content