Hey Philippe, I'll review these and put them in if everything looks good!
Thanks, GC On Wed, Dec 22, 2010 at 7:27 AM, Philippe Roussel <[email protected]> wrote: > I am not sure anyone reads [email protected] so I'm trying here. > > Philippe > > -------- Message transféré -------- > De: Philippe Roussel <[email protected]> > À: [email protected] > Sujet: Gorm patches to review > Date: Tue, 21 Dec 2010 14:27:35 +0100 > > Hi, > > Lately I had problems with Gorm logging (with libobjc2) messages such as > > Calling [GormObjectEditor -draggingUpdated:] with incorrect signature. > Method has i...@0:8...@16, selector has i...@0:8...@16 > > and not being able to connect an NSBox to an outlet. Following Fred > Kiefer's advice I changed -draggingUpdated: return type to > NSDragOperation. > I also changed the return type of draggingSourceOperationMaskForLocal: > as per Apple documentation but this should also be done in gnustep-gui > so I'm not sure it's a good idea to do it on Gorm just now. > > With the patch applied I can connect a NSBox to an outlet by dragging > the NSOwner icon to the NSBox. Don't ask me why but it works... > > The second patch fixes what seems to be a typo. > > Hope this helps, > Philippe > > -- > GNU's Not Unix -- IIS Isn't Secure > > > Index: Palettes/0Menus/GormMenuEditor.m > =================================================================== > --- Palettes/0Menus/GormMenuEditor.m (révision 31752) > +++ Palettes/0Menus/GormMenuEditor.m (copie de travail) > @@ -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) > { > Index: GormCore/GormSplitViewEditor.m > =================================================================== > --- GormCore/GormSplitViewEditor.m (révision 31752) > +++ GormCore/GormSplitViewEditor.m (copie de travail) > @@ -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; > Index: GormCore/GormPalettesManager.m > =================================================================== > --- GormCore/GormPalettesManager.m (révision 31752) > +++ GormCore/GormPalettesManager.m (copie de travail) > @@ -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 @@ > } > } > > -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag > +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag > { > return NSDragOperationCopy; > } > Index: GormCore/GormViewWithSubviewsEditor.m > =================================================================== > --- GormCore/GormViewWithSubviewsEditor.m (révision 31752) > +++ GormCore/GormViewWithSubviewsEditor.m (copie de travail) > @@ -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]; > Index: GormCore/GormWindowEditor.h > =================================================================== > --- GormCore/GormWindowEditor.h (révision 31752) > +++ GormCore/GormWindowEditor.h (copie de travail) > @@ -94,7 +94,7 @@ > /** > * Returns NSDragOperationNone. > */ > -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag; > +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag; > > /** > * Make current selection visible. > Index: GormCore/GormWindowEditor.m > =================================================================== > --- GormCore/GormWindowEditor.m (révision 31752) > +++ GormCore/GormWindowEditor.m (copie de travail) > @@ -343,18 +343,18 @@ > } > } > > -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag > +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag > { > NSDebugLog(@"draggingSourceOperationMaskForLocal"); > 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; > } > Index: GormCore/GormViewEditor.m > =================================================================== > --- GormCore/GormViewEditor.m (révision 31752) > +++ GormCore/GormViewEditor.m (copie de travail) > @@ -1201,7 +1201,7 @@ > } > } > > -- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender > +- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender > { > NSPasteboard *dragPb; > NSArray *types; > @@ -1224,7 +1224,7 @@ > } > } > > -- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender > +- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender > { > return [self draggingEntered: sender]; > } > @@ -1375,7 +1375,7 @@ > return NO; > } > > -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL) flag > +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL) flag > { > return NSDragOperationLink; > } > Index: GormCore/GormObjectEditor.h > =================================================================== > --- GormCore/GormObjectEditor.h (révision 31752) > +++ GormCore/GormObjectEditor.h (copie de travail) > @@ -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; > Index: GormCore/GormObjectEditor.m > =================================================================== > --- GormCore/GormObjectEditor.m (révision 31752) > +++ GormCore/GormObjectEditor.m (copie de travail) > @@ -226,7 +226,7 @@ > { > } > > -- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender > +- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender > { > NSArray *pbTypes = nil; > > @@ -246,7 +246,7 @@ > return [self draggingUpdated: sender]; > } > > -- (unsigned) draggingUpdated: (id<NSDraggingInfo>)sender > +- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)sender > { > if (dragType == GormLinkPboardType) > { > @@ -316,7 +316,7 @@ > } > } > > -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag > +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag > { > return NSDragOperationLink; > } > Index: GormCore/GormResourceEditor.h > =================================================================== > --- GormCore/GormResourceEditor.h (révision 31752) > +++ GormCore/GormResourceEditor.h (copie de travail) > @@ -29,7 +29,7 @@ > > �...@interface GormResourceEditor : GormGenericEditor > - (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f; > -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag; > +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag; > - (void) refreshCells; > - (id) placeHolderWithPath: (NSString *)path; > - (NSArray *) pbTypes; > Index: GormCore/GormResourceEditor.m > =================================================================== > --- GormCore/GormResourceEditor.m (révision 31752) > +++ GormCore/GormResourceEditor.m (copie de travail) > @@ -54,7 +54,7 @@ > { > } > > -- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag > +- (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)flag > { > return NSDragOperationCopy; > } > > > And the second one : > > Index: Palettes/2Controls/GormPopUpButtonEditor.m > =================================================================== > --- Palettes/2Controls/GormPopUpButtonEditor.m (révision 31752) > +++ Palettes/2Controls/GormPopUpButtonEditor.m (copie de travail) > @@ -105,7 +105,7 @@ > else > { > selectedItem = [self indexOfSelectedItem]; > - if (selectedItem = -1) > + if (selectedItem == -1) > selectedItem = 0; > } > > > > > > > _______________________________________________ > Discuss-gnustep mailing list > [email protected] > http://lists.gnu.org/mailman/listinfo/discuss-gnustep > -- Gregory Casamento - GNUstep Lead/Principal Consultant, OLC, Inc. yahoo/skype: greg_casamento, aol: gjcasa (240)274-9630 (Cell) _______________________________________________ Discuss-gnustep mailing list [email protected] http://lists.gnu.org/mailman/listinfo/discuss-gnustep
