diff -urNbB CVS/core/gui/Headers/gnustep/gui/GSPasteboardServer.h CVS.build/gui/Headers/gnustep/gui/GSPasteboardServer.h --- CVS/core/gui/Headers/gnustep/gui/GSPasteboardServer.h Thu Apr 29 13:04:50 1999 +++ CVS.build/gui/Headers/gnustep/gui/GSPasteboardServer.h Wed Jan 29 18:50:22 2003 @@ -44,7 +44,7 @@ * This protocol for use in asking GSPasteboardObj on the server to * perform tasks for the local NSPasteboard objects. */ -@protocol GSPasteboardObj +@protocol GSPasteboardObj - (int) addTypes: (in bycopy NSArray*)types owner: (id)owner pasteboard: (NSPasteboard*)pb @@ -72,7 +72,7 @@ * This protocol for use in obtaining GSPasteboardObj from the server * and controlling general server behaviour. */ -@protocol GSPasteboardSvr +@protocol GSPasteboardSvr // Use this next to implement [+pasteboardByFilteringData:ofType:] and // [+pasteboardByFilteringFile:] methods. - (id) pasteboardByFilteringData: (in bycopy NSData*)data diff -urNbB CVS/core/gui/Headers/gnustep/gui/NSMenuItem.h CVS.build/gui/Headers/gnustep/gui/NSMenuItem.h --- CVS/core/gui/Headers/gnustep/gui/NSMenuItem.h Wed Oct 30 09:12:59 2002 +++ CVS.build/gui/Headers/gnustep/gui/NSMenuItem.h Wed Jan 29 18:50:22 2003 @@ -42,7 +42,7 @@ * placed in a menu as a menu item. The [NSMenuItem] class provides * a reference implementation suitable for most uses. */ -@protocol NSMenuItem +@protocol NSMenuItem + (id) separatorItem; + (void) setUsesUserKeyEquivalents: (BOOL)flag; diff -urNbB CVS/core/gui/Headers/gnustep/gui/NSToolbar.h CVS.build/gui/Headers/gnustep/gui/NSToolbar.h --- CVS/core/gui/Headers/gnustep/gui/NSToolbar.h Wed Oct 16 09:32:50 2002 +++ CVS.build/gui/Headers/gnustep/gui/NSToolbar.h Wed Jan 29 18:50:22 2003 @@ -41,6 +41,8 @@ @class NSToolbarItem; @class NSNotification; +@class GSToolbarView; + /* * Constants */ @@ -71,6 +73,7 @@ } // Instance methods +- (id) toolbarView; - (BOOL) allowsUserCustomization; - (BOOL) autosavesConfiguration; - (NSDictionary*) configurationDictionary; diff -urNbB CVS/core/gui/Headers/gnustep/gui/NSView.h CVS.build/gui/Headers/gnustep/gui/NSView.h --- CVS/core/gui/Headers/gnustep/gui/NSView.h Tue Oct 22 14:15:30 2002 +++ CVS.build/gui/Headers/gnustep/gui/NSView.h Wed Jan 29 18:50:22 2003 @@ -220,6 +220,7 @@ */ + (NSView*) focusView; - (void) lockFocus; +- (void) lockFocusInRect: (NSRect)rect; - (void) unlockFocus; #ifndef STRICT_OPENSTEP - (BOOL) lockFocusIfCanDraw; diff -urNbB CVS/core/gui/Source/NSBundleAdditions.m CVS.build/gui/Source/NSBundleAdditions.m --- CVS/core/gui/Source/NSBundleAdditions.m Wed Jan 8 09:11:45 2003 +++ CVS.build/gui/Source/NSBundleAdditions.m Wed Jan 29 18:50:28 2003 @@ -824,7 +824,7 @@ // fill in actual object from template... [obj setBackgroundColor: [self backgroundColor]]; - [obj setContentView: [self contentView]]; + [(NSWindow *)obj setContentView: [self contentView]]; [obj setFrameAutosaveName: [self frameAutosaveName]]; [obj setHidesOnDeactivate: [self hidesOnDeactivate]]; [obj setInitialFirstResponder: [self initialFirstResponder]]; diff -urNbB CVS/core/gui/Source/NSImage.m CVS.build/gui/Source/NSImage.m --- CVS/core/gui/Source/NSImage.m Tue Jan 21 09:07:50 2003 +++ CVS.build/gui/Source/NSImage.m Wed Jan 29 18:50:28 2003 @@ -787,7 +787,7 @@ fromRect: (NSRect)aRect fraction: (float)aFloat { - NSImageRep *rep; + NSImageRep *rep = nil; NS_DURING { @@ -1049,7 +1049,7 @@ max_rep = nil; while ((rep = [enumerator nextObject]) != nil) { - int rep_bps; + int rep_bps = 0; if ([rep respondsToSelector: @selector(bitsPerPixel)]) rep_bps = [(NSBitmapImageRep *)rep bitsPerPixel]; if (rep_bps > max_bps) diff -urNbB CVS/core/gui/Source/NSImageRep.m CVS.build/gui/Source/NSImageRep.m --- CVS/core/gui/Source/NSImageRep.m Thu Mar 28 05:53:18 2002 +++ CVS.build/gui/Source/NSImageRep.m Wed Jan 29 18:50:28 2003 @@ -431,8 +431,8 @@ - (BOOL) drawAtPoint: (NSPoint)aPoint { BOOL ok, reset; - NSGraphicsContext *ctxt; - NSAffineTransform *ctm; + NSGraphicsContext *ctxt = nil; + NSAffineTransform *ctm = nil; if (_size.width == 0 && _size.height == 0) return NO; diff -urNbB CVS/core/gui/Source/NSPasteboard.m CVS.build/gui/Source/NSPasteboard.m --- CVS/core/gui/Source/NSPasteboard.m Tue Apr 16 17:16:37 2002 +++ CVS.build/gui/Source/NSPasteboard.m Wed Jan 29 18:50:28 2003 @@ -162,7 +162,7 @@ if (RETAIN((id)the_server) != nil) { - NSConnection* conn = [(id)the_server connectionForProxy]; + NSConnection* conn = [(NSDistantObject *)the_server connectionForProxy]; [[NSNotificationCenter defaultCenter] addObserver: self @@ -244,7 +244,7 @@ * If this is the case, our proxy for the object on the server will be * out of date, so we swap it for the newly created one. */ - if (p->target != (id)aTarget) + if (![p->target isEqual: aTarget]) { AUTORELEASE(p->target); p->target = RETAIN((id)aTarget); diff -urNbB CVS/core/gui/Source/NSSound.m CVS.build/gui/Source/NSSound.m --- CVS/core/gui/Source/NSSound.m Fri Jan 17 10:13:48 2003 +++ CVS.build/gui/Source/NSSound.m Wed Jan 29 18:50:28 2003 @@ -73,7 +73,7 @@ @end -@protocol GSSoundSvr +@protocol GSSoundSvr - (BOOL) playSound: (id)aSound; - (BOOL) stopSoundWithIdentifier: (NSString *)identifier; @@ -156,7 +156,7 @@ if (RETAIN ((id)the_server) != nil) { - NSConnection* conn = [(id)the_server connectionForProxy]; + NSConnection* conn = [(NSDistantObject *)the_server connectionForProxy]; [[NSNotificationCenter defaultCenter] addObserver: self diff -urNbB CVS/core/gui/Source/NSSplitView.m CVS.build/gui/Source/NSSplitView.m --- CVS/core/gui/Source/NSSplitView.m Mon Nov 18 09:41:15 2002 +++ CVS.build/gui/Source/NSSplitView.m Wed Jan 29 18:50:28 2003 @@ -118,7 +118,7 @@ BOOL delegateConstrains = NO; SEL constrainSel = @selector(splitView:constrainSplitPosition:ofSubviewAt:); - IMP constrainImp; + IMP constrainImp = 0; /* if there are less the two subviews, there is nothing to do */ diff -urNbB CVS/core/gui/Source/NSStringDrawing.m CVS.build/gui/Source/NSStringDrawing.m --- CVS/core/gui/Source/NSStringDrawing.m Mon Nov 11 09:07:31 2002 +++ CVS.build/gui/Source/NSStringDrawing.m Wed Jan 29 18:50:28 2003 @@ -254,8 +254,9 @@ { unsigned int size = 1; unsigned char *dst = buf; + const unichar glyph = run->glyphs[i].glyph; - GSFromUnicode(&dst, &size, &(run->glyphs[i].glyph), 1, enc, 0, 0); + GSFromUnicode(&dst, &size, &glyph, 1, enc, 0, 0); } else { diff -urNbB CVS/core/gui/Source/NSTableHeaderCell.m CVS.build/gui/Source/NSTableHeaderCell.m --- CVS/core/gui/Source/NSTableHeaderCell.m Wed Feb 13 19:11:02 2002 +++ CVS.build/gui/Source/NSTableHeaderCell.m Wed Jan 29 18:50:28 2003 @@ -199,4 +199,14 @@ break; } } + +- (void)setHighlighted: (BOOL) flag +{ + _cell.is_highlighted = flag; + if (flag == YES) + [self setBackgroundColor: [NSColor controlColor]]; + else + [self setBackgroundColor: [NSColor controlShadowColor]]; +} + @end diff -urNbB CVS/core/gui/Source/NSTableHeaderView.m CVS.build/gui/Source/NSTableHeaderView.m --- CVS/core/gui/Source/NSTableHeaderView.m Wed Oct 16 09:32:56 2002 +++ CVS.build/gui/Source/NSTableHeaderView.m Wed Jan 29 18:50:28 2003 @@ -195,12 +195,10 @@ should override setHighlighted: to change the background color. */ [cell setHighlighted: YES]; - [cell setBackgroundColor: [NSColor controlColor]]; } else { [cell setHighlighted: NO]; - [cell setBackgroundColor: [NSColor controlShadowColor]]; } [cell drawWithFrame: drawingRect inView: self]; @@ -216,12 +214,10 @@ || [_tableView isColumnSelected: lastColumnToDraw]) { [cell setHighlighted: YES]; - [cell setBackgroundColor: [NSColor controlColor]]; } else { [cell setHighlighted: NO]; - [cell setBackgroundColor: [NSColor controlShadowColor]]; } [cell drawWithFrame: drawingRect inView: self]; @@ -237,12 +233,10 @@ || [_tableView isColumnSelected: lastColumnToDraw]) { [cell setHighlighted: YES]; - [cell setBackgroundColor: [NSColor controlColor]]; } else { [cell setHighlighted: NO]; - [cell setBackgroundColor: [NSColor controlShadowColor]]; } [cell drawWithFrame: drawingRect inView: self]; @@ -530,8 +524,7 @@ objectAtIndex: columnIndex]]; rect.origin.y++; rect.size.height--; - [[currentColumn headerCell] - setBackgroundColor: [NSColor controlColor]]; + [[currentColumn headerCell] setHighlighted: YES]; [[currentColumn headerCell] highlight: YES @@ -766,8 +759,7 @@ objectAtIndex: columnIndex]]; rect.origin.y++; rect.size.height--; - [[currentColumn headerCell] - setBackgroundColor: [NSColor controlShadowColor]]; + [[currentColumn headerCell] setHighlighted: NO]; [[currentColumn headerCell] highlight: NO @@ -821,8 +813,7 @@ objectAtIndex: columnIndex]]; rect.origin.y++; rect.size.height--; - [[currentColumn headerCell] - setBackgroundColor: [NSColor controlShadowColor]]; + [[currentColumn headerCell] setHighlighted: NO]; [[currentColumn headerCell] highlight: NO diff -urNbB CVS/core/gui/Source/NSTableView.m CVS.build/gui/Source/NSTableView.m --- CVS/core/gui/Source/NSTableView.m Thu Nov 14 10:26:41 2002 +++ CVS.build/gui/Source/NSTableView.m Wed Jan 29 18:50:28 2003 @@ -4182,7 +4182,7 @@ NSDate *distantFuture = [NSDate distantFuture]; NSEvent *lastEvent; NSSet *_oldSelectedRows; - id delegateIfItTakesPart; + id delegateIfItTakesPart = nil; BOOL mouseUp = NO; BOOL done = NO; BOOL draggingPossible = [self _isDraggingSource]; diff -urNbB CVS/core/gui/Source/NSTextView.m CVS.build/gui/Source/NSTextView.m --- CVS/core/gui/Source/NSTextView.m Wed Jan 29 09:30:20 2003 +++ CVS.build/gui/Source/NSTextView.m Wed Jan 29 18:50:28 2003 @@ -2034,6 +2034,10 @@ /* Returns the ranges to which various kinds of user changes should apply. */ +- (NSRange) selectedRange +{ + return [self selectedRange]; +} -(NSRange) rangeForUserCharacterAttributeChange { diff -urNbB CVS/core/gui/Source/NSToolbar.m CVS.build/gui/Source/NSToolbar.m --- CVS/core/gui/Source/NSToolbar.m Wed Jan 8 09:11:47 2003 +++ CVS.build/gui/Source/NSToolbar.m Wed Jan 29 18:50:28 2003 @@ -119,6 +119,11 @@ } // Instance methods +- (GSToolbarView *) toolbarView +{ + return _toolbarView; +} + - (BOOL) allowsUserCustomization { return _allowsUserCustomization; diff -urNbB CVS/core/gui/Source/NSView.m CVS.build/gui/Source/NSView.m --- CVS/core/gui/Source/NSView.m Wed Dec 11 09:06:01 2002 +++ CVS.build/gui/Source/NSView.m Wed Jan 29 18:50:28 2003 @@ -1543,7 +1543,7 @@ { NSGraphicsContext *ctxt = GSCurrentContext(); NSRect wrect; - int window_gstate; + int window_gstate = 0; if (viewIsPrinting == nil) { diff -urNbB CVS/core/gui/Source/NSWindow.m CVS.build/gui/Source/NSWindow.m --- CVS/core/gui/Source/NSWindow.m Mon Jan 27 09:13:48 2003 +++ CVS.build/gui/Source/NSWindow.m Wed Jan 29 18:50:28 2003 @@ -69,6 +69,7 @@ #include #include #include +#include BOOL GSViewAcceptsDrag(NSView *v, id dragInfo); @@ -3926,7 +3927,7 @@ - (void) setToolbar: (NSToolbar*)toolbar { ASSIGN(_toolbar, toolbar); - [_wv addSubview: [toolbar _toolbarView]]; + [_wv addSubview: [toolbar toolbarView]]; [self setViewsNeedDisplay: YES]; } diff -urNbB CVS/core/gui/TextConverters/RTF/RTFConsumer.m CVS.build/gui/TextConverters/RTF/RTFConsumer.m --- CVS/core/gui/TextConverters/RTF/RTFConsumer.m Wed Jan 29 09:30:21 2003 +++ CVS.build/gui/TextConverters/RTF/RTFConsumer.m Wed Jan 29 19:01:44 2003 @@ -391,7 +391,7 @@ NSFileWrapper *wrapper = [[NSFileWrapper alloc] initWithSerializedRepresentation: rtfData]; - str = [self parseFile: wrapper documentAttributes: dict]; + str = [RTFConsumer parseFile: wrapper documentAttributes: dict]; RELEASE (wrapper); return str;