$OpenBSD$ --- GormCore/GormObjectEditor.h.orig Fri Feb 22 20:07:56 2013 +++ GormCore/GormObjectEditor.h Fri Feb 22 20:08:15 2013 @@ -33,7 +33,7 @@ } + (void) setEditor: (id)editor forDocument: (id)aDocument; - (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f; -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag; +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag; - (BOOL) acceptsTypeFromArray: (NSArray*)types; - (void) makeSelectionVisible: (BOOL)flag; - (void) resetObject: (id)anObject; $OpenBSD$ --- GormCore/GormObjectEditor.m.orig Fri Feb 22 19:31:49 2013 +++ GormCore/GormObjectEditor.m Fri Feb 22 19:35:42 2013 @@ -226,7 +226,7 @@ static NSMapTable *docMap = 0; { } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { NSArray *pbTypes = nil; @@ -246,7 +246,7 @@ static NSMapTable *docMap = 0; return [self draggingUpdated: sender]; } -- (unsigned) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { if (dragType == GormLinkPboardType) { @@ -316,7 +316,7 @@ static NSMapTable *docMap = 0; } } -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag { return NSDragOperationLink; } $OpenBSD$ --- GormCore/GormPalettesManager.m.orig Fri Feb 22 19:24:31 2013 +++ GormCore/GormPalettesManager.m Fri Feb 22 20:09:38 2013 @@ -55,7 +55,7 @@ NSPasteboard *dragPb; } - (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f; -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag; +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag; @end @implementation GormPaletteView @@ -128,7 +128,7 @@ static NSImage *dragImage = nil; } } -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag { return NSDragOperationCopy; } @@ -143,7 +143,7 @@ static NSImage *dragImage = nil; * dropped back on the palette (a window is normally created if the * dnd drop is refused). */ -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { return NSDragOperationCopy;; } $OpenBSD$ --- GormCore/GormSplitViewEditor.m.orig Fri Feb 22 19:36:45 2013 +++ GormCore/GormSplitViewEditor.m Fri Feb 22 19:37:37 2013 @@ -121,7 +121,7 @@ } } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { NSPasteboard *dragPb; NSArray *types; @@ -165,7 +165,7 @@ } } -- (unsigned) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { NSPasteboard *dragPb; NSArray *types; $OpenBSD$ --- GormCore/GormViewEditor.m.orig Fri Feb 22 19:35:53 2013 +++ GormCore/GormViewEditor.m Fri Feb 22 19:39:10 2013 @@ -1224,7 +1224,7 @@ static BOOL currently_displaying = NO; } } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { NSPasteboard *dragPb; NSArray *types; @@ -1247,7 +1247,7 @@ static BOOL currently_displaying = NO; } } -- (unsigned) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { return [self draggingEntered: sender]; } @@ -1398,7 +1398,7 @@ static BOOL currently_displaying = NO; return NO; } -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL) flag +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL) flag { return NSDragOperationLink; } $OpenBSD$ --- GormCore/GormViewWithSubviewsEditor.m.orig Fri Feb 22 19:39:14 2013 +++ GormCore/GormViewWithSubviewsEditor.m Fri Feb 22 19:40:12 2013 @@ -293,7 +293,7 @@ return [selection count]; } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { NSRect rect = [_editedObject bounds]; NSPoint loc = [sender draggingLocation]; @@ -365,7 +365,7 @@ [[self window] flushWindow]; } -- (unsigned int) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { NSPoint loc = [sender draggingLocation]; NSRect rect = [_editedObject bounds]; $OpenBSD$ --- GormCore/GormWindowEditor.m.orig Fri Feb 22 19:40:24 2013 +++ GormCore/GormWindowEditor.m Fri Feb 22 19:40:54 2013 @@ -349,12 +349,12 @@ return NSDragOperationNone; } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { return NSDragOperationNone; } -- (unsigned) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { return NSDragOperationNone; } $OpenBSD$ --- Palettes/0Menus/GormMenuEditor.m.orig Fri Feb 22 19:24:32 2013 +++ Palettes/0Menus/GormMenuEditor.m Fri Feb 22 20:10:12 2013 @@ -66,7 +66,7 @@ - (void) deleteSelection; - (id) document; - (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f; -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag; +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag; - (id) editedObject; - (void) makeSelectionVisible: (BOOL)flag; - (id) openSubeditorForObject: (id)anObject; @@ -522,7 +522,7 @@ */ } -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag { if (isLinkSource == YES) return NSDragOperationLink; @@ -530,7 +530,7 @@ return NSDragOperationCopy; } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { NSArray *types; @@ -551,7 +551,7 @@ return [self draggingUpdated: sender]; } -- (unsigned) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { if (dragType == IBMenuPboardType) { $OpenBSD$ --- Palettes/3Containers/GormTableViewEditor.m.orig Fri Feb 22 19:43:02 2013 +++ Palettes/3Containers/GormTableViewEditor.m Fri Feb 22 19:43:37 2013 @@ -413,12 +413,12 @@ static NSText *_textObject; RELEASE(_editedCell); } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { return [self draggingUpdated: sender]; } -- (unsigned) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { NSPasteboard *dragPb; NSArray *types; $OpenBSD$ --- Palettes/4Data/GormTextViewEditor.m.orig Fri Feb 22 19:44:10 2013 +++ Palettes/4Data/GormTextViewEditor.m Fri Feb 22 19:44:39 2013 @@ -91,12 +91,12 @@ [[textView enclosingScrollView] setPostsFrameChangedNotifications: NO]; } -- (unsigned) draggingEntered: (id)sender +- (NSDragOperation) draggingEntered: (id)sender { return [self draggingUpdated: sender]; } -- (unsigned) draggingUpdated: (id)sender +- (NSDragOperation) draggingUpdated: (id)sender { NSPasteboard *dragPb; NSArray *types;