Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 03:15:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

MacOS: replace deprecated message by its recommended successor.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12527 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2017-10-25 11:34:03 +00:00
parent eb772d027d
commit 31e3d3758e
1 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+37 -11
View File
@@ -2190,6 +2190,9 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
, NSTextInputClient , NSTextInputClient
#endif #endif
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
,NSDraggingSource
#endif
> { > {
BOOL in_key_event; // YES means keypress is being processed by handleEvent BOOL in_key_event; // YES means keypress is being processed by handleEvent
BOOL need_handle; // YES means Fl::handle(FL_KEYBOARD,) is needed after handleEvent processing BOOL need_handle; // YES means Fl::handle(FL_KEYBOARD,) is needed after handleEvent processing
@@ -2232,6 +2235,9 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange; - (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
- (NSInteger)windowLevel; - (NSInteger)windowLevel;
#endif #endif
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
- (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context;
#endif
@end @end
@implementation FLView @implementation FLView
@@ -2444,8 +2450,8 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
breakMacEventLoop(); breakMacEventLoop();
fl_unlock_function(); fl_unlock_function();
// if the DND started in the same application, Fl::dnd() will not return until // if the DND started in the same application, Fl::dnd() will not return until
// the the DND operation is finished. The call below causes the drop indicator // the DND operation is finished. The call below causes the drop indicator
// to be draw correctly (a full event handling would be better...) // to be drawn correctly (a full event handling would be better...)
Fl::flush(); Fl::flush();
return ret ? NSDragOperationCopy : NSDragOperationNone; return ret ? NSDragOperationCopy : NSDragOperationNone;
} }
@@ -2730,6 +2736,14 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
)conversationIdentifier { )conversationIdentifier {
return identifier; return identifier;
} }
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
- (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context
{
return NSDragOperationCopy;
}
#endif
@end @end
@@ -3930,13 +3944,9 @@ int Fl_Cocoa_Screen_Driver::dnd(int use_selection)
if (text==NULL) return false; if (text==NULL) return false;
NSAutoreleasePool *localPool; NSAutoreleasePool *localPool;
localPool = [[NSAutoreleasePool alloc] init]; localPool = [[NSAutoreleasePool alloc] init];
NSPasteboard *mypasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
[mypasteboard declareTypes:[NSArray arrayWithObject:UTF8_pasteboard_type] owner:nil];
[mypasteboard setData:(NSData*)text forType:UTF8_pasteboard_type];
CFRelease(text);
Fl_Widget *w = Fl::pushed(); Fl_Widget *w = Fl::pushed();
Fl_Window *win = w->top_window(); Fl_Window *win = w->top_window();
NSView *myview = [Fl_X::i(win)->xid contentView]; FLView *myview = (FLView*)[Fl_X::i(win)->xid contentView];
NSEvent *theEvent = [NSApp currentEvent]; NSEvent *theEvent = [NSApp currentEvent];
int width, height; int width, height;
@@ -3948,13 +3958,29 @@ int Fl_Cocoa_Screen_Driver::dnd(int use_selection)
image = defaultDragImage(&width, &height); image = defaultDragImage(&width, &height);
} }
static NSSize offset={0,0};
NSPoint pt = [theEvent locationInWindow]; NSPoint pt = [theEvent locationInWindow];
pt.x -= width/2; pt.x -= width/2;
pt.y -= height/2; pt.y -= height/2;
[myview dragImage:image at:pt offset:offset #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
event:theEvent pasteboard:mypasteboard if (fl_mac_os_version >= 100700) {
source:myview slideBack:YES]; NSPasteboardItem *pbItem = [[[NSPasteboardItem alloc] init] autorelease];
[pbItem setData:(NSData*)text forType:UTF8_pasteboard_type];
NSDraggingItem *dragItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease];
NSRect r = {pt, {width, height}};
[dragItem setDraggingFrame:r contents:image];
[myview beginDraggingSessionWithItems:[NSArray arrayWithObject:dragItem] event:theEvent source:myview];
} else
#endif
{
static NSSize offset={0,0};
NSPasteboard *mypasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
[mypasteboard declareTypes:[NSArray arrayWithObject:UTF8_pasteboard_type] owner:nil];
[mypasteboard setData:(NSData*)text forType:UTF8_pasteboard_type];
[myview dragImage:image at:pt offset:offset // deprecated in 10.7
event:theEvent pasteboard:mypasteboard
source:myview slideBack:YES];
}
CFRelease(text);
if ( w ) { if ( w ) {
int old_event = Fl::e_number; int old_event = Fl::e_number;
w->handle(Fl::e_number = FL_RELEASE); w->handle(Fl::e_number = FL_RELEASE);