mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 17:52:42 +00:00
Adopted dragging destination method return values to MacOSX 10.4
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@22893 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b6341d6e1a
commit
43537498de
9 changed files with 26 additions and 13 deletions
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
|||
2006-05-11 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Headers/AppKit/NSDragging.h,
|
||||
* Source/NSColorWell.m,
|
||||
* Source/NSImageView.m,
|
||||
* Source/NSOutlineView.m,
|
||||
* Source/NSSavePanel.m,
|
||||
* Source/NSTableView.m,
|
||||
* Source/NSTextView.m,
|
||||
* Source/NSApplication.m (-draggingEntered:, -draggingUpdated:):
|
||||
Changed return value to NSDragOperation.
|
||||
|
||||
2006-05-10 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSApplication.m (-finishLaunching): Don't display the
|
||||
|
|
|
@ -76,8 +76,8 @@ typedef enum _NSDragOperation {
|
|||
//
|
||||
// Before the Image is Released
|
||||
//
|
||||
- (unsigned int)draggingEntered:(id <NSDraggingInfo>)sender;
|
||||
- (unsigned int)draggingUpdated:(id <NSDraggingInfo>)sender;
|
||||
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
|
||||
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender;
|
||||
- (void)draggingExited:(id <NSDraggingInfo>)sender;
|
||||
|
||||
//
|
||||
|
@ -89,6 +89,7 @@ typedef enum _NSDragOperation {
|
|||
|
||||
#ifndef STRICT_OPENSTEP
|
||||
- (void)draggingEnded: (id <NSDraggingInfo>)sender;
|
||||
- (BOOL)wantsPeriodicDraggingUpdates;
|
||||
#endif
|
||||
@end
|
||||
|
||||
|
|
|
@ -461,7 +461,7 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
|
|||
{
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
return NSDragOperationGeneric;
|
||||
}
|
||||
|
@ -470,7 +470,7 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
|
|||
{
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
return NSDragOperationGeneric;
|
||||
}
|
||||
|
|
|
@ -137,7 +137,7 @@ static NSString *GSColorWellDidBecomeExclusiveNotification =
|
|||
[super dealloc];
|
||||
}
|
||||
|
||||
- (unsigned int) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *pb;
|
||||
NSDragOperation sourceDragMask;
|
||||
|
|
|
@ -151,7 +151,7 @@ static Class imageCellClass;
|
|||
|
||||
@implementation NSImageView (NSDraggingDestination)
|
||||
|
||||
- (unsigned int) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
{
|
||||
if (([sender draggingSource] != self) && ([self isEditable]) &&
|
||||
([NSImage canInitWithPasteboard: [sender draggingPasteboard]]))
|
||||
|
|
|
@ -1026,7 +1026,7 @@ static NSImage *unexpandable = nil;
|
|||
* Drag'n'drop support
|
||||
*/
|
||||
|
||||
- (unsigned int) draggingEntered: (id <NSDraggingInfo>) sender
|
||||
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>) sender
|
||||
{
|
||||
//NSLog(@"draggingEntered");
|
||||
currentDropRow = -1;
|
||||
|
@ -1043,7 +1043,7 @@ static NSImage *unexpandable = nil;
|
|||
[self displayIfNeeded];
|
||||
}
|
||||
|
||||
- (unsigned int) draggingUpdated: (id <NSDraggingInfo>) sender
|
||||
- (NSDragOperation) draggingUpdated: (id <NSDraggingInfo>) sender
|
||||
{
|
||||
NSPoint p = [sender draggingLocation];
|
||||
NSRect newRect;
|
||||
|
|
|
@ -95,7 +95,7 @@ static BOOL _gs_display_reading_progress = NO;
|
|||
|
||||
@implementation NSSavePanel (_PrivateMethods)
|
||||
|
||||
- (unsigned int) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *pb;
|
||||
|
||||
|
|
|
@ -5581,7 +5581,7 @@ static inline float computePeriod(NSPoint mouseLocationWin,
|
|||
}
|
||||
|
||||
|
||||
- (unsigned int) draggingEntered: (id <NSDraggingInfo>) sender
|
||||
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>) sender
|
||||
{
|
||||
currentDropRow = -1;
|
||||
currentDropOperation = -1;
|
||||
|
@ -5599,7 +5599,7 @@ static inline float computePeriod(NSPoint mouseLocationWin,
|
|||
[self displayIfNeeded];
|
||||
}
|
||||
|
||||
- (unsigned int) draggingUpdated: (id <NSDraggingInfo>) sender
|
||||
- (NSDragOperation) draggingUpdated: (id <NSDraggingInfo>) sender
|
||||
{
|
||||
NSPoint p = [sender draggingLocation];
|
||||
NSRect newRect;
|
||||
|
|
|
@ -4050,7 +4050,7 @@ other than copy/paste or dragging. */
|
|||
/**** Drag and drop handling ****/
|
||||
|
||||
// dragging of text, colors and files
|
||||
- (unsigned int) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *pboard = [sender draggingPasteboard];
|
||||
NSArray *types = [self readablePasteboardTypes];
|
||||
|
@ -4084,7 +4084,7 @@ other than copy/paste or dragging. */
|
|||
return flags;
|
||||
}
|
||||
|
||||
- (unsigned int) draggingUpdated: (id <NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id <NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *pboard = [sender draggingPasteboard];
|
||||
NSArray *types = [self readablePasteboardTypes];
|
||||
|
|
Loading…
Reference in a new issue