mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-04-23 06:20:47 +00:00
* GormCore/GormObjectEditor.h
* GormCore/GormObjectEditor.m * GormCore/GormPalettesManager.m * GormCore/GormSplitViewEditor.m * GormCore/GormViewEditor.m * GormCore/GormViewWithSubviewsEditor.m * GormCore/GormWindowEditor.m * Palettes/0Menus/GormMenuEditor.m * Palettes/3Containers/GormTableViewEditor.m * Palettes/4Data/GormTextViewEditor.m * adapt to -gui changes for DnD OK Fred, Gregory git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@36191 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
c92bf0ebfb
commit
b74dcdfa9a
11 changed files with 37 additions and 24 deletions
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
|||
2013-02-23 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
||||
* GormCore/GormObjectEditor.h
|
||||
* GormCore/GormObjectEditor.m
|
||||
* GormCore/GormPalettesManager.m
|
||||
* GormCore/GormSplitViewEditor.m
|
||||
* GormCore/GormViewEditor.m
|
||||
* GormCore/GormViewWithSubviewsEditor.m
|
||||
* GormCore/GormWindowEditor.m
|
||||
* Palettes/0Menus/GormMenuEditor.m
|
||||
* Palettes/3Containers/GormTableViewEditor.m
|
||||
* Palettes/4Data/GormTextViewEditor.m
|
||||
* adapt to -gui changes for DnD
|
||||
|
||||
2013-02-16 20:10-EST Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* GormCore/GormViewEditor.m: -editedObjectFrameDidChange:
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
}
|
||||
+ (void) setEditor: (id)editor forDocument: (id<IBDocuments>)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;
|
||||
|
|
|
@ -226,7 +226,7 @@ static NSMapTable *docMap = 0;
|
|||
{
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSArray *pbTypes = nil;
|
||||
|
||||
|
@ -246,7 +246,7 @@ static NSMapTable *docMap = 0;
|
|||
return [self draggingUpdated: sender];
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
if (dragType == GormLinkPboardType)
|
||||
{
|
||||
|
@ -316,7 +316,7 @@ static NSMapTable *docMap = 0;
|
|||
}
|
||||
}
|
||||
|
||||
- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag
|
||||
- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag
|
||||
{
|
||||
return NSDragOperationLink;
|
||||
}
|
||||
|
|
|
@ -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<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
return NSDragOperationCopy;;
|
||||
}
|
||||
|
|
|
@ -121,7 +121,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *dragPb;
|
||||
NSArray *types;
|
||||
|
@ -165,7 +165,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *dragPb;
|
||||
NSArray *types;
|
||||
|
|
|
@ -1224,7 +1224,7 @@ static BOOL currently_displaying = NO;
|
|||
}
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *dragPb;
|
||||
NSArray *types;
|
||||
|
@ -1247,7 +1247,7 @@ static BOOL currently_displaying = NO;
|
|||
}
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)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;
|
||||
}
|
||||
|
|
|
@ -293,7 +293,7 @@
|
|||
return [selection count];
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSRect rect = [_editedObject bounds];
|
||||
NSPoint loc = [sender draggingLocation];
|
||||
|
@ -365,7 +365,7 @@
|
|||
[[self window] flushWindow];
|
||||
}
|
||||
|
||||
- (unsigned int) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSPoint loc = [sender draggingLocation];
|
||||
NSRect rect = [_editedObject bounds];
|
||||
|
|
|
@ -349,12 +349,12 @@
|
|||
return NSDragOperationNone;
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
return NSDragOperationNone;
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
return NSDragOperationNone;
|
||||
}
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
- (void) deleteSelection;
|
||||
- (id<IBDocuments>) 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<IBEditors>) 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<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSArray *types;
|
||||
|
||||
|
@ -551,7 +551,7 @@
|
|||
return [self draggingUpdated: sender];
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
if (dragType == IBMenuPboardType)
|
||||
{
|
||||
|
|
|
@ -413,12 +413,12 @@ static NSText *_textObject;
|
|||
RELEASE(_editedCell);
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
return [self draggingUpdated: sender];
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *dragPb;
|
||||
NSArray *types;
|
||||
|
|
|
@ -91,12 +91,12 @@
|
|||
[[textView enclosingScrollView] setPostsFrameChangedNotifications: NO];
|
||||
}
|
||||
|
||||
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
return [self draggingUpdated: sender];
|
||||
}
|
||||
|
||||
- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender
|
||||
{
|
||||
NSPasteboard *dragPb;
|
||||
NSArray *types;
|
||||
|
|
Loading…
Reference in a new issue