mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 12:00:48 +00:00
* NSWindow.m renmae captureMouse: to _captureMouse: (designate as non OS),
various methods add fieldEditor support. * GSContext.m/GSContext.h revert to previous code as solution discussed with Adam Fedor regarding backends had problems I had not forseen. * NSBrowserCell.h/.m specify text subcell as an NSCell, eliminate image cell, copyWithZone: optimize and eliminate use of ASSIGN (fixes serious dealloc bug), highlight: eliminate method (fixes dup display bug). * NSButtonCell.m copyWithZone: optimize and eliminate use of ASSIGN * NSStringDrawing.h/.m remove unimplemented draw methods from Category (these are backend specific, can't be defined twice and are already implemented in xraw). * NSApplication.h redefine initialize_gnustep_backend () per Adam's redefinition in the backend. * Functions.m/.h remove initialize_gnustep_backend() * NSCell.m preliminary implementation of fieldEditor mechanism, copyWithZone: optimize and eliminate use of ASSIGN * NSControl.m rename cell class global to _NSCONTROL_CELL_CLASS * NSMatrix.m implement NSControl's updateCell: to prevent unecessary matrix drawing if possible. * NSView.m -resizeWithOldSuperviewSize reverted code to my own once more (fewer lines and no if/else logic), changed code to use view frame instead of bounds per 3.3/4.2 docs, optimize to avoid floating point math and scale adjustment unless view has been scaled. * NSScrollView.m define as externs various PS* functions for use in drawing, polish drawing, move all backend code to front. * Tools/dummy.m define dummy PS* functions employed in gui. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3454 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
3bdb18f536
commit
22040ec62b
21 changed files with 1402 additions and 1390 deletions
|
@ -130,6 +130,8 @@ int style;
|
|||
[content_view release]; // Release the content view
|
||||
}
|
||||
|
||||
if(_fieldEditor)
|
||||
[_fieldEditor release];
|
||||
[background_color release];
|
||||
[represented_filename release];
|
||||
[miniaturized_title release];
|
||||
|
@ -265,12 +267,7 @@ NSView *wv;
|
|||
// Window device attributes
|
||||
//
|
||||
- (NSBackingStoreType)backingType { return backing_type; }
|
||||
|
||||
- (NSDictionary *)deviceDescription
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (NSDictionary *)deviceDescription { return nil; }
|
||||
- (int)gState { return 0; }
|
||||
- (BOOL)isOneShot { return is_one_shot; }
|
||||
|
||||
|
@ -307,10 +304,17 @@ NSView *wv;
|
|||
}
|
||||
|
||||
- (NSText *)fieldEditor:(BOOL)createFlag forObject:anObject
|
||||
{
|
||||
{ // ask delegate if it can
|
||||
if ([delegate respondsToSelector: // provide a field editor
|
||||
@selector(windowWillReturnFieldEditor:toObject:)])
|
||||
return [delegate windowWillReturnFieldEditor:self toObject:anObject];
|
||||
|
||||
if(!_fieldEditor && createFlag) // each window has a global
|
||||
_fieldEditor = [[NSText alloc] init]; // text field editor
|
||||
|
||||
{ // text field editor
|
||||
_fieldEditor = [[NSText new] retain];
|
||||
[_fieldEditor setFieldEditor:YES];
|
||||
}
|
||||
|
||||
return _fieldEditor;
|
||||
}
|
||||
|
||||
|
@ -381,8 +385,7 @@ NSApplication *theApp = [NSApplication sharedApplication];
|
|||
- (void)orderFrontRegardless {}
|
||||
- (void)orderOut:sender {}
|
||||
|
||||
- (void)orderWindow:(NSWindowOrderingMode)place
|
||||
relativeTo:(int)otherWin
|
||||
- (void)orderWindow:(NSWindowOrderingMode)place relativeTo:(int)otherWin
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -900,6 +903,8 @@ NSView *v;
|
|||
v = [content_view hitTest:[theEvent locationInWindow]];
|
||||
NSDebugLog([v description]);
|
||||
NSDebugLog(@"\n");
|
||||
if(first_responder != v) // if hit view is not first
|
||||
[self makeFirstResponder:v]; // responder ask it to be
|
||||
[v mouseDown:theEvent];
|
||||
last_point = [theEvent locationInWindow];
|
||||
break;
|
||||
|
@ -1094,8 +1099,7 @@ id result = nil;
|
|||
return YES;
|
||||
}
|
||||
|
||||
- (NSSize)windowWillResize:(NSWindow *)sender
|
||||
toSize:(NSSize)frameSize
|
||||
- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize
|
||||
{
|
||||
if ([delegate respondsToSelector:@selector(windowWillResize:toSize:)])
|
||||
return [delegate windowWillResize:sender toSize:frameSize];
|
||||
|
@ -1103,8 +1107,7 @@ id result = nil;
|
|||
return frameSize;
|
||||
}
|
||||
|
||||
- windowWillReturnFieldEditor:(NSWindow *)sender
|
||||
toObject:client
|
||||
- windowWillReturnFieldEditor:(NSWindow *)sender toObject:client
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
|
@ -1311,8 +1314,8 @@ id result = nil;
|
|||
//
|
||||
// Mouse capture/release
|
||||
//
|
||||
- (void)captureMouse: sender {} // Do nothing, should be
|
||||
- (void)releaseMouse: sender {} // implemented by back-end
|
||||
- (void)_captureMouse: sender {} // Do nothing, should be
|
||||
- (void)_releaseMouse: sender {} // implemented by back-end
|
||||
- (void)performDeminiaturize:sender {}
|
||||
- (void)performHide:sender {}
|
||||
- (void)performUnhide:sender {}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue