removing workaround for listbox, finishing drop target support, fixes #14484, see...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index f49f1df02c9bdb88012bbccb73035f15b34c938b..52944855be8ff8bf95523dfb63a4e7b0461c252e 100644 (file)
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -555,8 +555,8 @@ wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
     wxListWidgetCocoaImpl* c = new wxListWidgetCocoaImpl( wxpeer, scrollview, tableview, ds );
 
     // temporary hook for dnd
-    [tableview registerForDraggedTypes:[NSArray arrayWithObjects:
-        NSStringPboardType, NSFilenamesPboardType, (NSString*) kPasteboardTypeFileURLPromise, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
+ //   [tableview registerForDraggedTypes:[NSArray arrayWithObjects:
+ //       NSStringPboardType, NSFilenamesPboardType, (NSString*) kPasteboardTypeFileURLPromise, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
 
     [ds setImplementation:c];
     return c;

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 46aa01527af1b1d4015f387ec18240b0dbf5abe8..92c240664419096a8a2a33576a0de0001fbf43b6 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -2084,8 +2084,12 @@ void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target)
     if( dobj )
     {
         CFMutableArrayRef typesarray = CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks);
-        
-        [m_osxView registerForDraggedTypes:(NSArray*)typesarray];
+        dobj->AddSupportedTypes(typesarray);
+        NSView* targetView = m_osxView;
+        if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+            targetView = [(NSScrollView*) m_osxView documentView];
+
+        [targetView registerForDraggedTypes:(NSArray*)typesarray];
         CFRelease(typesarray);
     }
 }