mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 08:50:57 +00:00
* move DPSOperators.h to XDPS.
* move GPS headers into a new backend. * define GSContext.h/GSContext.m as abstract super for all drawing destinations (eliminates the need for DPS, GPS, DGS at the root of the AppKit) add appropriate defintion to various classes. * NSMatrix.m add abstract backend code from xraw (eliminate backend). * NSSlider.m add abstract backend code from xraw (eliminate backend). * NSSliderCell.m add abstract backend code from xraw (eliminate backend). * NSSplitView.m add abstract backend code from xraw (eliminate backend). replace private divider highlight method with NSHighlightRect() * NSWindow.m add class method to create backend specific window view. * NSTextField.m add abstract backend code from xraw (eliminate backend). * NSForm.m add abstract backend code from xraw (eliminate backend). * NSFormCell.m add abstract backend code from xraw (eliminate backend). * NSColorWell.m add abstract backend code from xraw (eliminate backend). * NSButton.m add abstract backend code from xraw (eliminate backend). * NSControl.m add abstract backend code from xraw (eliminate backend). * NSBox.m add abstract backend code from xraw (eliminate backend). * NSBrowser.m add abstract backend code from xraw (eliminate backend). * NSBrowserCell.m add abstract backend code from xraw (eliminate backend). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3321 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
d1456177e3
commit
2d4079f2cf
53 changed files with 2429 additions and 5144 deletions
|
@ -44,6 +44,8 @@
|
|||
#include <AppKit/NSApplication.h>
|
||||
#include <AppKit/NSMatrix.h>
|
||||
|
||||
|
||||
|
||||
/* Define the following symbol when NSView will support flipped views */
|
||||
//#define HAS_FLIPPED_VIEWS 1
|
||||
|
||||
|
@ -995,6 +997,12 @@ fprintf(stderr, " NSMatrix: selectTextAtRow --- ");
|
|||
NSRect intRect, upperLeftRect;
|
||||
NSArray* row;
|
||||
|
||||
if(drawsBackground)
|
||||
{
|
||||
[backgroundColor set];
|
||||
NSRectFill(rect); // draw the background
|
||||
}
|
||||
|
||||
[self _getRow:&row1 column:&col1
|
||||
#if HAS_FLIPPED_VIEWS
|
||||
forPoint:rect.origin
|
||||
|
@ -1039,28 +1047,28 @@ fprintf(stderr, " NSMatrix: selectTextAtRow --- ");
|
|||
}
|
||||
}
|
||||
|
||||
- (void)drawCellAtRow:(int)row
|
||||
column:(int)column
|
||||
- (void)drawCellAtRow:(int)row column:(int)column
|
||||
{
|
||||
NSCell *aCell = [self cellAtRow:row column:column];
|
||||
NSRect cellFrame = [self cellFrameAtRow:row column:column];
|
||||
NSCell *aCell = [self cellAtRow:row column:column];
|
||||
NSRect cellFrame = [self cellFrameAtRow:row column:column];
|
||||
|
||||
[aCell drawWithFrame:cellFrame inView:self];
|
||||
[aCell drawWithFrame:cellFrame inView:self];
|
||||
}
|
||||
|
||||
- (void)highlightCell:(BOOL)flag
|
||||
atRow:(int)row
|
||||
column:(int)column
|
||||
atRow:(int)row
|
||||
column:(int)column
|
||||
{
|
||||
NSCell *aCell = [self cellAtRow:row column:column];
|
||||
NSRect cellFrame;
|
||||
NSCell *aCell = [self cellAtRow:row column:column];
|
||||
NSRect cellFrame;
|
||||
|
||||
if (aCell) {
|
||||
cellFrame = [self cellFrameAtRow:row column:column];
|
||||
[aCell highlight:flag
|
||||
withFrame:[self cellFrameAtRow:row column:column]
|
||||
inView:self];
|
||||
}
|
||||
if (aCell)
|
||||
{
|
||||
cellFrame = [self cellFrameAtRow:row column:column];
|
||||
[aCell highlight:flag
|
||||
withFrame:[self cellFrameAtRow:row column:column]
|
||||
inView:self];
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)sendAction
|
||||
|
@ -1129,7 +1137,7 @@ fprintf(stderr, " NSMatrix: selectTextAtRow --- ");
|
|||
|
||||
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent
|
||||
{
|
||||
return mode == NSListModeMatrix ? NO : YES;
|
||||
return mode == NSListModeMatrix ? NO : YES;
|
||||
}
|
||||
|
||||
- (void)mouseDown:(NSEvent*)theEvent
|
||||
|
@ -1453,6 +1461,70 @@ static MPoint anchor = {0, 0};
|
|||
- (BOOL)isFlipped { return YES; }
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
//
|
||||
// Methods that may not be needed FIX ME
|
||||
//
|
||||
|
||||
/*
|
||||
* Get characters until you encounter
|
||||
* a carriage return, return number of characters.
|
||||
* Deal with backspaces, etc. Deal with Expose events
|
||||
* on all windows associated with this application.
|
||||
* Deal with keyboard remapping.
|
||||
*/
|
||||
|
||||
- (void)keyDown:(NSEvent *)theEvent;
|
||||
{
|
||||
unsigned int flags = [theEvent modifierFlags];
|
||||
unsigned int key_code = [theEvent keyCode];
|
||||
NSRect rect = [self cellFrameAtRow:selectedRow column:selectedColumn];
|
||||
|
||||
fprintf(stderr, " NSMatrix: keyDown --- ");
|
||||
|
||||
// If not editable then don't recognize the key down
|
||||
if (![selectedCell isEditable]) return;
|
||||
|
||||
[self lockFocus];
|
||||
|
||||
// If RETURN key then make the next text the first responder
|
||||
if (key_code == 0x0d)
|
||||
{
|
||||
[selectedCell endEditing:nil];
|
||||
[selectedCell drawInteriorWithFrame: rect inView: self];
|
||||
return;
|
||||
}
|
||||
|
||||
// Hide the cursor during typing
|
||||
[NSCursor hide];
|
||||
|
||||
[selectedCell _handleKeyEvent:theEvent];
|
||||
[selectedCell drawInteriorWithFrame: rect inView: self];
|
||||
[self unlockFocus];
|
||||
}
|
||||
|
||||
- (BOOL)acceptsFirstResponder
|
||||
{
|
||||
if ([selectedCell isSelectable])
|
||||
return YES;
|
||||
else
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL)becomeFirstResponder
|
||||
{
|
||||
if ([selectedCell isSelectable])
|
||||
{
|
||||
// [selectedCell selectText:self];
|
||||
return YES;
|
||||
}
|
||||
else
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue