CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 10:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use ui_cocoa_window_set_droppable for now

Browse Source
This commit is contained in:
Twinaphex 2016-06-04 08:45:20 +02:00
parent 47c7330cc8
commit bb5107b5fa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/drivers/cocoa/cocoa_common.m
View File

@ -64,9 +64,10 @@ void *glkitview_init(void);
#if defined(HAVE_COCOA) #if defined(HAVE_COCOA)
[self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
ui_window_cocoa_t view; ui_window_cocoa_t cocoa_view;
view.data = (CocoaView*)self; cocoa_view.data = (CocoaView*)self;
ui_window_cocoa_set_droppable(&view, true);
[self registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, NSFilenamesPboardType, nil]];
#elif defined(HAVE_COCOATOUCH) #elif defined(HAVE_COCOATOUCH)
self.view = (__bridge GLKView*)glkitview_init(); self.view = (__bridge GLKView*)glkitview_init();

2
ui/drivers/cocoa/ui_cocoa_window.m
View File

@ -62,7 +62,7 @@ void ui_window_cocoa_set_droppable(void *data, bool droppable)
if (droppable) if (droppable)
{ {
[[cocoa_view window] registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]]; [[cocoa_view window] registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, NSFilenamesPboardType, nil]];
} }
else else
{ {