mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 06:40:47 +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
6130d3c1f9
commit
f29476bc08
21 changed files with 1402 additions and 1390 deletions
|
@ -134,10 +134,14 @@
|
|||
|
||||
- (void)dealloc
|
||||
{
|
||||
[contents release];
|
||||
[cell_image release];
|
||||
if(contents)
|
||||
[contents release];
|
||||
if(cell_image)
|
||||
[cell_image release];
|
||||
[cell_font release];
|
||||
[represented_object release];
|
||||
if(represented_object)
|
||||
[represented_object release];
|
||||
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
|
@ -386,14 +390,27 @@ NSString* _string;
|
|||
// Editing Text
|
||||
//
|
||||
- (void)editWithFrame:(NSRect)aRect
|
||||
inView:(NSView *)controlView
|
||||
editor:(NSText *)textObject
|
||||
delegate:(id)anObject
|
||||
event:(NSEvent *)theEvent
|
||||
{}
|
||||
inView:(NSView *)controlView
|
||||
editor:(NSText *)textObject
|
||||
delegate:(id)anObject
|
||||
event:(NSEvent *)theEvent
|
||||
{
|
||||
[[controlView window] makeFirstResponder:textObject];
|
||||
|
||||
[textObject setFrame:aRect];
|
||||
[textObject setText:[self stringValue]];
|
||||
[textObject setDelegate:anObject];
|
||||
[controlView addSubview:textObject];
|
||||
NSEraseRect(aRect);
|
||||
[textObject display];
|
||||
}
|
||||
|
||||
- (void)endEditing:(NSText *)textObject
|
||||
{}
|
||||
{
|
||||
[textObject removeFromSuperview];
|
||||
[self setStringValue: [textObject text]];
|
||||
[textObject setDelegate:nil];
|
||||
}
|
||||
|
||||
- (void)selectWithFrame:(NSRect)aRect
|
||||
inView:(NSView *)controlView
|
||||
|
@ -719,9 +736,11 @@ BOOL mouseWentUp;
|
|||
{
|
||||
NSCell* c = [[isa allocWithZone: zone] init];
|
||||
|
||||
c->contents = [[contents copy] retain];
|
||||
ASSIGN(c->cell_image, cell_image);
|
||||
ASSIGN(c->cell_font, cell_font);
|
||||
if(contents)
|
||||
c->contents = [[contents copy] retain];
|
||||
if(cell_image)
|
||||
c->cell_image = [cell_image retain];
|
||||
c->cell_font = [cell_font retain];
|
||||
c->cell_state = cell_state;
|
||||
c->cell_highlighted = cell_highlighted;
|
||||
c->cell_enabled = cell_enabled;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue