From d757ef939eda7da3c6fa66552ecc3df1f0db3c52 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 15 Jul 2012 18:05:17 +0000 Subject: [PATCH] removing workaround for listbox, finishing drop target support, fixes #14484, see #14281 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/listbox.mm | 4 ++-- src/osx/cocoa/window.mm | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm index f49f1df02c..52944855be 100644 --- 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 46aa01527a..92c2406644 100644 --- 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); } } -- 2.45.2