gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 22:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied coordinate stuff to allow for window borders.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@6207 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-03-07 12:00:00 +00:00
parent 105f8f8c7d
commit 22b9a6867b
4 changed files with 154 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,6 +1,15 @@
Tue Mar 07 11:00:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSWindow.m: Changes throughout to use correct offsets for
differences between content rect and frame coordinates.
Base coordinate system is that of the content rect, so conversions
between screen and base coordinates are required except for
borderless windows (where the frame rect is the same as the content
rect).
Tue Mar 07 06:24:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk> Tue Mar 07 06:24:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSApplication.m: ([activateignoringOtherApps]) order key * Source/NSApplication.m: ([activateIgnoringOtherApps]) order key
window to front when activating app. window to front when activating app.
Tue Mar 7 03:23:55 2000 Nicola Pero <n.pero@mi.flashnet.it> Tue Mar 7 03:23:55 2000 Nicola Pero <n.pero@mi.flashnet.it>

26
Source/NSObjectProtocols.m
View file

@ -32,34 +32,34 @@
// //
// Before the Image is Released // Before the Image is Released
// //
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender - (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)sender
{ {
return NSDragOperationNone; return NSDragOperationNone;
} }
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender - (NSDragOperation) draggingUpdated: (id <NSDraggingInfo>)sender
{ {
return NSDragOperationNone; return NSDragOperationNone;
} }
- (void)draggingExited:(id <NSDraggingInfo>)sender - (void) draggingExited: (id <NSDraggingInfo>)sender
{ {
} }
// //
// After the Image is Released // After the Image is Released
// //
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender - (BOOL) prepareForDragOperation: (id <NSDraggingInfo>)sender
{ {
return NO; return NO;
} }
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender - (BOOL) performDragOperation: (id <NSDraggingInfo>)sender
{ {
return NO; return NO;
} }
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender - (void) concludeDragOperation: (id <NSDraggingInfo>)sender
{ {
} }
@ -70,12 +70,12 @@
// //
// Querying the Source // Querying the Source
// //
- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal - (NSDragOperation) draggingSourceOperationMaskForLocal: (BOOL)isLocal
{ {
return NSDragOperationNone; return NSDragOperationNone;
} }
- (BOOL)ignoreModifierKeysWhileDragging - (BOOL) ignoreModifierKeysWhileDragging
{ {
return NO; return NO;
} }
@ -83,14 +83,14 @@
// //
// Informing the Source // Informing the Source
// //
- (void)draggedImage:(NSImage *)image - (void) draggedImage: (NSImage*)image
beganAt:(NSPoint)screenPoint beganAt: (NSPoint)screenPoint
{ {
} }
- (void)draggedImage: (NSImage*)image - (void) draggedImage: (NSImage*)image
endedAt: (NSPoint)screenPoint endedAt: (NSPoint)screenPoint
deposited: (BOOL)didDeposit deposited: (BOOL)didDeposit
{ {
} }

18
Source/NSView.m
View file

@ -2255,14 +2255,16 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
source: (id)sourceObject source: (id)sourceObject
slideBack: (BOOL)slideFlag slideBack: (BOOL)slideFlag
{ {
NSView *dragView = (NSView *)[GSCurrentContext() _dragInfo]; NSView *dragView = (NSView*)[GSCurrentContext() _dragInfo];
[dragView dragImage: anImage
at: viewLocation
offset: initialOffset [dragView dragImage: anImage
event: event at: viewLocation
pasteboard: pboard offset: initialOffset
source: sourceObject event: event
slideBack: slideFlag]; pasteboard: pboard
source: sourceObject
slideBack: slideFlag];
} }
- (void) registerForDraggedTypes: (NSArray*)types - (void) registerForDraggedTypes: (NSArray*)types

201
Source/NSWindow.m
View file

@ -353,22 +353,55 @@ static NSMapTable* windowmaps = NULL;
+ (NSRect) contentRectForFrameRect: (NSRect)aRect + (NSRect) contentRectForFrameRect: (NSRect)aRect
styleMask: (unsigned int)aStyle styleMask: (unsigned int)aStyle
{ {
// FIXME: The server should be asked for the border size NSGraphicsContext *context = GSCurrentContext();
float t, b, l, r;
DPSstyleoffsets(context, &l, &r, &t, &b, aStyle);
aRect.size.width -= (l + r);
aRect.size.height -= (t + b);
aRect.origin.x += l;
aRect.origin.y += b;
return aRect; return aRect;
} }
+ (NSRect) frameRectForContentRect: (NSRect)aRect + (NSRect) frameRectForContentRect: (NSRect)aRect
styleMask: (unsigned int)aStyle styleMask: (unsigned int)aStyle
{ {
// FIXME: The server should be asked for the border size NSGraphicsContext *context = GSCurrentContext();
float t, b, l, r;
DPSstyleoffsets(context, &l, &r, &t, &b, aStyle);
aRect.size.width += (l + r);
aRect.size.height += (t + b);
aRect.origin.x -= l;
aRect.origin.y -= b;
return aRect; return aRect;
} }
+ (NSRect) minFrameWidthWithTitle: (NSString *)aTitle + (NSRect) minFrameWidthWithTitle: (NSString*)aTitle
styleMask: (unsigned int)aStyle styleMask: (unsigned int)aStyle
{ {
// FIXME: The server should be asked for the border size NSGraphicsContext *context = GSCurrentContext();
return NSZeroRect; float t, b, l, r;
NSRect f = NSZeroRect;
DPSstyleoffsets(context, &l, &r, &t, &b, aStyle);
f.size.width = l + r;
f.size.height = t + b;
/*
* Assume that the width of the area needed for a button is equal to
* the height of the title bar.
*/
if (aStyle & NSClosableWindowMask)
f.size.width += t;
if (aStyle & NSMiniaturizableWindowMask)
f.size.width += t;
/*
* FIXME - title width has to be better determined than this.
* need to get correct values from font.
*/
f.size.width += [aTitle length] * 10;
return f;
} }
/* default Screen and window depth */ /* default Screen and window depth */
@ -378,7 +411,7 @@ static NSMapTable* windowmaps = NULL;
return 8; return 8;
} }
+ (void)menuChanged:(NSMenu *)aMenu + (void)menuChanged: (NSMenu*)aMenu
{ {
// FIXME: This method is for MS Windows only, does nothing // FIXME: This method is for MS Windows only, does nothing
// on other window systems // on other window systems
@ -488,7 +521,8 @@ static NSMapTable* windowmaps = NULL;
style_mask = aStyle; style_mask = aStyle;
frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle]; frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle];
minimum_size = NSMakeSize(1, 1); minimum_size = NSMakeSize(frame.size.width - contentRect.size.width + 1,
frame.size.height - contentRect.size.height + 1);
maximum_size = r.size; maximum_size = r.size;
[self setNextResponder: NSApp]; [self setNextResponder: NSApp];
@ -498,13 +532,13 @@ static NSMapTable* windowmaps = NULL;
/* Create the window view */ /* Create the window view */
cframe.origin = NSZeroPoint; cframe.origin = NSZeroPoint;
cframe.size = frame.size; cframe.size = contentRect.size;
_wv = [[GSWindowView allocWithZone: [self zone]] initWithFrame: cframe]; _wv = [[GSWindowView allocWithZone: [self zone]] initWithFrame: cframe];
[_wv viewWillMoveToWindow: self]; [_wv viewWillMoveToWindow: self];
/* Create the content view */ /* Create the content view */
cframe.origin = NSZeroPoint; cframe.origin = NSZeroPoint;
cframe.size = frame.size; cframe.size = contentRect.size;
[self setContentView: AUTORELEASE([[NSView alloc] initWithFrame: cframe])]; [self setContentView: AUTORELEASE([[NSView alloc] initWithFrame: cframe])];
/* rectBeingDrawn is variable used to optimize flushing the backing store. /* rectBeingDrawn is variable used to optimize flushing the backing store.
@ -540,7 +574,7 @@ static NSMapTable* windowmaps = NULL;
return content_view; return content_view;
} }
- (void) setContentView: (NSView *)aView - (void) setContentView: (NSView*)aView
{ {
if (aView == nil) if (aView == nil)
{ {
@ -566,17 +600,17 @@ static NSMapTable* windowmaps = NULL;
/* /*
* Window graphics * Window graphics
*/ */
- (NSColor *) backgroundColor - (NSColor*) backgroundColor
{ {
return background_color; return background_color;
} }
- (NSString *) representedFilename - (NSString*) representedFilename
{ {
return represented_filename; return represented_filename;
} }
- (void) setBackgroundColor: (NSColor *)color - (void) setBackgroundColor: (NSColor*)color
{ {
ASSIGN(background_color, color); ASSIGN(background_color, color);
} }
@ -627,7 +661,7 @@ static NSMapTable* windowmaps = NULL;
return style_mask; return style_mask;
} }
- (NSString *) title - (NSString*) title
{ {
return window_title; return window_title;
} }
@ -640,7 +674,7 @@ static NSMapTable* windowmaps = NULL;
return backing_type; return backing_type;
} }
- (NSDictionary *) deviceDescription - (NSDictionary*) deviceDescription
{ {
return [[self screen] deviceDescription]; return [[self screen] deviceDescription];
} }
@ -673,17 +707,17 @@ static NSMapTable* windowmaps = NULL;
/* /*
* The miniwindow * The miniwindow
*/ */
- (NSImage *) miniwindowImage - (NSImage*) miniwindowImage
{ {
return miniaturized_image; return miniaturized_image;
} }
- (NSString *) miniwindowTitle - (NSString*) miniwindowTitle
{ {
return miniaturized_title; return miniaturized_title;
} }
- (void) setMiniwindowImage: (NSImage *)image - (void) setMiniwindowImage: (NSImage*)image
{ {
ASSIGN(miniaturized_image, image); ASSIGN(miniaturized_image, image);
if (_counterpart != 0 && (style_mask & NSMiniWindowMask) == 0) if (_counterpart != 0 && (style_mask & NSMiniWindowMask) == 0)
@ -741,7 +775,7 @@ static NSMapTable* windowmaps = NULL;
} }
} }
- (NSText *) fieldEditor: (BOOL)createFlag forObject: (id)anObject - (NSText*) fieldEditor: (BOOL)createFlag forObject: (id)anObject
{ {
NSText *edit; NSText *edit;
/* ask delegate if it can provide a field editor */ /* ask delegate if it can provide a field editor */
@ -767,7 +801,7 @@ static NSMapTable* windowmaps = NULL;
/* /*
* Window controller * Window controller
*/ */
- (void)setWindowController:(NSWindowController *)windowController - (void) setWindowController: (NSWindowController*)windowController
{ {
ASSIGN(_windowController, windowController); ASSIGN(_windowController, windowController);
} }
@ -1132,8 +1166,10 @@ static NSMapTable* windowmaps = NULL;
- (NSRect) constrainFrameRect: (NSRect)frameRect toScreen: screen - (NSRect) constrainFrameRect: (NSRect)frameRect toScreen: screen
{ {
// FIXME: The implementation of this method is missing NSRect r = [screen frame];
return NSZeroRect;
r = NSIntersectionRect(r, frameRect);
return r;
} }
- (NSRect) frame - (NSRect) frame
@ -1156,6 +1192,8 @@ static NSMapTable* windowmaps = NULL;
NSRect r = frame; NSRect r = frame;
r.size = aSize; r.size = aSize;
r = [NSWindow frameRectForContentRect: r styleMask: style_mask];
r.origin = frame.origin;
[self setFrame: r display: YES]; [self setFrame: r display: YES];
} }
@ -1271,20 +1309,26 @@ static NSMapTable* windowmaps = NULL;
*/ */
- (NSPoint) convertBaseToScreen: (NSPoint)basePoint - (NSPoint) convertBaseToScreen: (NSPoint)basePoint
{ {
NSPoint screenPoint; NSGraphicsContext *context = GSCurrentContext();
NSPoint screenPoint;
float t, b, l, r;
screenPoint.x = frame.origin.x + basePoint.x; DPSstyleoffsets(context, &l, &r, &t, &b, style_mask);
screenPoint.y = frame.origin.y + basePoint.y; screenPoint.x = frame.origin.x + basePoint.x + l;
screenPoint.y = frame.origin.y + basePoint.y + b;
return screenPoint; return screenPoint;
} }
- (NSPoint) convertScreenToBase: (NSPoint)screenPoint - (NSPoint) convertScreenToBase: (NSPoint)screenPoint
{ {
NSPoint basePoint; NSGraphicsContext *context = GSCurrentContext();
NSPoint basePoint;
float t, b, l, r;
basePoint.x = screenPoint.x - frame.origin.x; DPSstyleoffsets(context, &l, &r, &t, &b, style_mask);
basePoint.y = screenPoint.y - frame.origin.y; basePoint.x = screenPoint.x - frame.origin.x - l;
basePoint.y = screenPoint.y - frame.origin.y - b;
return basePoint; return basePoint;
} }
@ -1457,17 +1501,17 @@ static NSMapTable* windowmaps = NULL;
return _rFlags.needs_display; return _rFlags.needs_display;
} }
- (void)cacheImageInRect:(NSRect)aRect - (void) cacheImageInRect: (NSRect)aRect
{ {
// FIXME: This Method is missing // FIXME: This Method is missing
} }
- (void)discardCachedImage - (void) discardCachedImage
{ {
// FIXME: This Method is missing // FIXME: This Method is missing
} }
- (void)restoreCachedImage - (void) restoreCachedImage
{ {
// FIXME: This Method is missing // FIXME: This Method is missing
} }
@ -1485,7 +1529,7 @@ static NSMapTable* windowmaps = NULL;
return NO; return NO;
} }
- (NSScreen *) deepestScreen - (NSScreen*) deepestScreen
{ {
// FIXME: We must check the screens the window is on // FIXME: We must check the screens the window is on
return [NSScreen deepestScreen]; return [NSScreen deepestScreen];
@ -1501,7 +1545,7 @@ static NSMapTable* windowmaps = NULL;
return _f.dynamic_depth_limit; return _f.dynamic_depth_limit;
} }
- (NSScreen *) screen - (NSScreen*) screen
{ {
// FIXME: Works only if there is only one screen // FIXME: Works only if there is only one screen
return [NSScreen mainScreen]; return [NSScreen mainScreen];
@ -1573,7 +1617,7 @@ discardCursorRectsForView(NSView *theView)
_f.cursor_rects_enabled = YES; _f.cursor_rects_enabled = YES;
} }
- (void) invalidateCursorRectsForView: (NSView *)aView - (void) invalidateCursorRectsForView: (NSView*)aView
{ {
if (((NSViewPtr)aView)->_rFlags.valid_rects) if (((NSViewPtr)aView)->_rFlags.valid_rects)
{ {
@ -1797,13 +1841,13 @@ resetCursorRectsForView(NSView *theView)
return _f.accepts_mouse_moved; return _f.accepts_mouse_moved;
} }
- (NSEvent *) currentEvent - (NSEvent*) currentEvent
{ {
return [NSApp currentEvent]; return [NSApp currentEvent];
} }
- (void) discardEventsMatchingMask: (unsigned int)mask - (void) discardEventsMatchingMask: (unsigned int)mask
beforeEvent: (NSEvent *)lastEvent beforeEvent: (NSEvent*)lastEvent
{ {
[NSApp discardEventsMatchingMask: mask beforeEvent: lastEvent]; [NSApp discardEventsMatchingMask: mask beforeEvent: lastEvent];
} }
@ -1847,7 +1891,7 @@ resetCursorRectsForView(NSView *theView)
return YES; return YES;
} }
- (void) setInitialFirstResponder: (NSView *)aView - (void) setInitialFirstResponder: (NSView*)aView
{ {
if ([aView isKindOfClass: viewClass]) if ([aView isKindOfClass: viewClass])
{ {
@ -1855,12 +1899,12 @@ resetCursorRectsForView(NSView *theView)
} }
} }
- (NSView *) initialFirstResponder - (NSView*) initialFirstResponder
{ {
return _initial_first_responder; return _initial_first_responder;
} }
- (void) keyDown: (NSEvent *)theEvent - (void) keyDown: (NSEvent*)theEvent
{ {
unsigned int key_code = [theEvent keyCode]; unsigned int key_code = [theEvent keyCode];
@ -1914,16 +1958,14 @@ resetCursorRectsForView(NSView *theView)
* loop status */ * loop status */
- (NSPoint) mouseLocationOutsideOfEventStream - (NSPoint) mouseLocationOutsideOfEventStream
{ {
float x; NSPoint p;
float y;
DPSmouselocation(GSCurrentContext(), &x, &y); DPSmouselocation(GSCurrentContext(), &p.x, &p.y);
x -= frame.origin.x; p = [self convertScreenToBase: p];
y -= frame.origin.y; return p;
return NSMakePoint(x, y);
} }
- (NSEvent *) nextEventMatchingMask: (unsigned int)mask - (NSEvent*) nextEventMatchingMask: (unsigned int)mask
{ {
return [NSApp nextEventMatchingMask: mask return [NSApp nextEventMatchingMask: mask
untilDate: nil untilDate: nil
@ -1931,10 +1973,10 @@ resetCursorRectsForView(NSView *theView)
dequeue: YES]; dequeue: YES];
} }
- (NSEvent *) nextEventMatchingMask: (unsigned int)mask - (NSEvent*) nextEventMatchingMask: (unsigned int)mask
untilDate: (NSDate *)expiration untilDate: (NSDate*)expiration
inMode: (NSString *)mode inMode: (NSString*)mode
dequeue: (BOOL)deqFlag dequeue: (BOOL)deqFlag
{ {
return [NSApp nextEventMatchingMask: mask return [NSApp nextEventMatchingMask: mask
untilDate: expiration untilDate: expiration
@ -1942,7 +1984,7 @@ resetCursorRectsForView(NSView *theView)
dequeue: deqFlag]; dequeue: deqFlag];
} }
- (void) postEvent: (NSEvent *)event atStart: (BOOL)flag - (void) postEvent: (NSEvent*)event atStart: (BOOL)flag
{ {
[NSApp postEvent: event atStart: flag]; [NSApp postEvent: event atStart: flag];
} }
@ -1952,8 +1994,8 @@ resetCursorRectsForView(NSView *theView)
_f.accepts_mouse_moved = flag; _f.accepts_mouse_moved = flag;
} }
- (void) _checkTrackingRectangles: (NSView *)theView - (void) _checkTrackingRectangles: (NSView*)theView
forEvent: (NSEvent *)theEvent forEvent: (NSEvent*)theEvent
{ {
if (((NSViewPtr)theView)->_rFlags.has_trkrects) if (((NSViewPtr)theView)->_rFlags.has_trkrects)
{ {
@ -2063,7 +2105,7 @@ resetCursorRectsForView(NSView *theView)
} }
} }
- (void) _checkCursorRectangles: (NSView *)theView forEvent: (NSEvent *)theEvent - (void) _checkCursorRectangles: (NSView*)theView forEvent: (NSEvent*)theEvent
{ {
if (((NSViewPtr)theView)->_rFlags.valid_rects) if (((NSViewPtr)theView)->_rFlags.valid_rects)
{ {
@ -2107,7 +2149,7 @@ resetCursorRectsForView(NSView *theView)
context: [theEvent context] context: [theEvent context]
eventNumber: 0 eventNumber: 0
trackingNumber: (int)YES trackingNumber: (int)YES
userData: (void *)r]; userData: (void*)r];
[self postEvent: e atStart: YES]; [self postEvent: e atStart: YES];
} }
// Mouse exited // Mouse exited
@ -2123,7 +2165,7 @@ resetCursorRectsForView(NSView *theView)
context: [theEvent context] context: [theEvent context]
eventNumber: 0 eventNumber: 0
trackingNumber: (int)NO trackingNumber: (int)NO
userData: (void *)r]; userData: (void*)r];
[self postEvent: e atStart: YES]; [self postEvent: e atStart: YES];
} }
} }
@ -2155,7 +2197,7 @@ resetCursorRectsForView(NSView *theView)
if (gstate) if (gstate)
{ {
NSGraphicsContext* context = GSCurrentContext(); NSGraphicsContext *context = GSCurrentContext();
DPSgsave(context); DPSgsave(context);
DPSsetgstate(context, gstate); DPSsetgstate(context, gstate);
DPSupdatewindow(context, window_num); DPSupdatewindow(context, window_num);
@ -2168,7 +2210,7 @@ resetCursorRectsForView(NSView *theView)
} }
- (void) sendEvent: (NSEvent *)theEvent - (void) sendEvent: (NSEvent*)theEvent
{ {
NSView *v; NSView *v;
NSEventType type; NSEventType type;
@ -2303,8 +2345,8 @@ resetCursorRectsForView(NSView *theView)
case NSCursorUpdate: // Cursor update case NSCursorUpdate: // Cursor update
{ {
GSTrackingRect *r =(GSTrackingRect *)[theEvent userData]; GSTrackingRect *r =(GSTrackingRect*)[theEvent userData];
NSCursor *c = (NSCursor *)[r owner]; NSCursor *c = (NSCursor*)[r owner];
if ([theEvent trackingNumber]) // It's a mouse entered if ([theEvent trackingNumber]) // It's a mouse entered
{ {
@ -2475,7 +2517,7 @@ resetCursorRectsForView(NSView *theView)
} }
} }
- (BOOL) tryToPerform: (SEL)anAction with: anObject - (BOOL) tryToPerform: (SEL)anAction with: (id)anObject
{ {
// FIXME: On NO we should hand it on to the delegate // FIXME: On NO we should hand it on to the delegate
return ([super tryToPerform: anAction with: anObject]); return ([super tryToPerform: anAction with: anObject]);
@ -2486,7 +2528,7 @@ resetCursorRectsForView(NSView *theView)
return NO; return NO;
} }
- (void) selectKeyViewFollowingView: (NSView *)aView - (void) selectKeyViewFollowingView: (NSView*)aView
{ {
NSView *theView = nil; NSView *theView = nil;
@ -2504,7 +2546,7 @@ resetCursorRectsForView(NSView *theView)
} }
} }
- (void) selectKeyViewPrecedingView: (NSView *)aView - (void) selectKeyViewPrecedingView: (NSView*)aView
{ {
NSView *theView = nil; NSView *theView = nil;
@ -2580,7 +2622,7 @@ resetCursorRectsForView(NSView *theView)
// to know whether they have received it from the window, and // to know whether they have received it from the window, and
// if so, in which direction is the selection moving (so that they know // if so, in which direction is the selection moving (so that they know
// if they should select the last or the first editable cell). // if they should select the last or the first editable cell).
- (NSSelectionDirection)keyViewSelectionDirection - (NSSelectionDirection) keyViewSelectionDirection
{ {
return _selection_direction; return _selection_direction;
} }
@ -2648,8 +2690,8 @@ resetCursorRectsForView(NSView *theView)
} }
} }
- (id) validRequestorForSendType: (NSString *)sendType - (id) validRequestorForSendType: (NSString*)sendType
returnType: (NSString *)returnType returnType: (NSString*)returnType
{ {
id result = nil; id result = nil;
@ -2667,12 +2709,12 @@ resetCursorRectsForView(NSView *theView)
/* /*
* Saving and restoring the frame * Saving and restoring the frame
*/ */
- (NSString *) frameAutosaveName - (NSString*) frameAutosaveName
{ {
return autosave_name; return autosave_name;
} }
- (void) saveFrameUsingName: (NSString *)name - (void) saveFrameUsingName: (NSString*)name
{ {
NSUserDefaults *defs; NSUserDefaults *defs;
NSString *key; NSString *key;
@ -2686,7 +2728,7 @@ resetCursorRectsForView(NSView *theView)
[windowsLock unlock]; [windowsLock unlock];
} }
- (BOOL) setFrameAutosaveName: (NSString *)name - (BOOL) setFrameAutosaveName: (NSString*)name
{ {
NSString *nameToRemove = nil; NSString *nameToRemove = nil;
@ -2734,7 +2776,7 @@ resetCursorRectsForView(NSView *theView)
return YES; return YES;
} }
- (void) setFrameFromString: (NSString *)string - (void) setFrameFromString: (NSString*)string
{ {
NSScanner *scanner = [NSScanner scannerWithString: string]; NSScanner *scanner = [NSScanner scannerWithString: string];
NSRect nRect; NSRect nRect;
@ -2847,7 +2889,7 @@ resetCursorRectsForView(NSView *theView)
[self setFrame: fRect display: YES]; [self setFrame: fRect display: YES];
} }
- (BOOL) setFrameUsingName: (NSString *)name - (BOOL) setFrameUsingName: (NSString*)name
{ {
NSUserDefaults *defs; NSUserDefaults *defs;
id obj; id obj;
@ -2888,7 +2930,7 @@ resetCursorRectsForView(NSView *theView)
/* /*
* Printing and postscript * Printing and postscript
*/ */
- (NSData *) dataWithEPSInsideRect: (NSRect)rect - (NSData*) dataWithEPSInsideRect: (NSRect)rect
{ {
// FIXME: The implementation of this method is missing // FIXME: The implementation of this method is missing
return nil; return nil;
@ -2908,7 +2950,7 @@ resetCursorRectsForView(NSView *theView)
* Zooming * Zooming
*/ */
- (BOOL)isZoomed - (BOOL) isZoomed
{ {
// FIXME: Method is missing // FIXME: Method is missing
return NO; return NO;
@ -2930,23 +2972,23 @@ resetCursorRectsForView(NSView *theView)
* Default botton * Default botton
*/ */
- (NSButtonCell *)defaultButtonCell - (NSButtonCell*) defaultButtonCell
{ {
// FIXME: Method is missing // FIXME: Method is missing
return nil; return nil;
} }
- (void)setDefaultButtonCell:(NSButtonCell *)aButtonCell - (void) setDefaultButtonCell: (NSButtonCell*)aButtonCell
{ {
// FIXME: Method is missing // FIXME: Method is missing
} }
- (void)disableKeyEquivalentForDefaultButtonCell - (void) disableKeyEquivalentForDefaultButtonCell
{ {
// FIXME: Method is missing // FIXME: Method is missing
} }
- (void)enableKeyEquivalentForDefaultButtonCell - (void) enableKeyEquivalentForDefaultButtonCell
{ {
// FIXME: Method is missing // FIXME: Method is missing
} }
@ -3134,10 +3176,10 @@ resetCursorRectsForView(NSView *theView)
interface_style = aStyle; interface_style = aStyle;
} }
- (void *)windowHandle - (void*) windowHandle
{ {
// FIXME: Should only be defined on MS Windows // FIXME: Should only be defined on MS Windows
return (void *) 0; return (void*) 0;
} }
@end @end
@ -3272,4 +3314,3 @@ NSWindow* GSWindowWithNumber(int num)
} }