Changed to use the values from the defaults database if specified. Minor fixes to the compilation process.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2608 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Ovidiu Predescu 1997-11-01 21:20:49 +00:00
parent 8b0975e122
commit 0639c42c5f
6 changed files with 32 additions and 9 deletions

View file

@ -1,3 +1,20 @@
Sat Nov 1 11:30:40 1997 Ovidiu Predescu <ovidiu@net-community.com>
* Source/GNUmakefile: Don't compile NSPasteboard.m if using
libFoundation.
* Source/NSBrowser.m: Include NSTextFieldCell.h to elimate compiler
warning.
(setCellClass:): Autorelease the newly created cell.
(addColumn): Autorelease the column.
(doClick:): Use respondsToSelector: instead of respondsTo:.
* Source/NSCell.m (initImageCell:): Changed the font size to be 0 so
that the font size from the defaults database is taken if it's
specified.
(initTextCell:): Likewise.
* Source/NSTextFieldCell.m (initTextCell:): Likewise.
* Headers/gnustep/gui/NSView.h: Add a definition for
_removeSubviewFromViewsThatNeedDisplay:.
Thu Oct 30 15:51:43 1997 Scott Christley <scottc@net-community.com>
* GNUmakefile: Add Tools directory.

View file

@ -354,6 +354,7 @@ enum {
- (NSRect)_boundingRectFor:(NSRect)rect;
- (void)_recursivelyResetNeedsDisplayInAllViews;
- (void)_removeSubviewFromViewsThatNeedDisplay:(NSView*)view;
- (void)_displayNeededViews;
/* Collects into `array' the invalid rectangles that need to be displayed. All

View file

@ -76,7 +76,6 @@ NSMenuItem.m \
NSOpenPanel.m \
NSPageLayout.m \
NSPanel.m \
NSPasteboard.m \
NSPrinter.m \
NSPrintInfo.m \
NSPrintOperation.m \
@ -104,6 +103,10 @@ PSMatrix.m \
tiff.m \
externs.m
ifneq ($(FOUNDATION_LIB), fd)
libgnustep-gui_OBJC_FILES += NSPasteboard.m
endif
libgnustep-gui_HEADER_FILES_DIR = ../Headers
libgnustep-gui_HEADER_FILES_INSTALL_DIR = /gnustep/gui

View file

@ -37,6 +37,7 @@
#include <AppKit/NSColor.h>
#include <AppKit/NSScrollView.h>
#include <AppKit/NSMatrix.h>
#include <AppKit/NSTextFieldCell.h>
#define COLUMN_SEP 6
@ -342,7 +343,7 @@
_browserCellClass = classId;
// set the prototype for the new class
[self setCellPrototype: [[_browserCellClass alloc] init]];
[self setCellPrototype: [[[_browserCellClass alloc] init] autorelease]];
}
- (void)setCellPrototype:(NSCell *)aCell
@ -523,7 +524,7 @@
NSScrollView *sc;
int n = [_browserColumns count];
bc = [[NSBrowserColumn alloc] init];
bc = [[[NSBrowserColumn alloc] init] autorelease];
// Create a scrollview
sc = [[NSScrollView alloc]
@ -1001,7 +1002,8 @@
return;
// Ask delegate if selection is ok
if ([_browserDelegate respondsTo: @selector(browser:selectRow:inColumn:)])
if ([_browserDelegate respondsToSelector:
@selector(browser:selectRow:inColumn:)])
{
int row = [sender selectedRow];
shouldSelect = [_browserDelegate browser: self selectRow: row
@ -1010,8 +1012,8 @@
else
{
// Try the other method
if ([_browserDelegate
respondsTo: @selector(browser:selectCellWithString:inColumn:)])
if ([_browserDelegate respondsToSelector:
@selector(browser:selectCellWithString:inColumn:)])
{
id c = [sender selectedCell];
shouldSelect = [_browserDelegate browser: self

View file

@ -109,7 +109,7 @@
cell_type = NSImageCellType;
cell_image = [anImage retain];
image_position = NSImageOnly;
cell_font = [[NSFont userFontOfSize:12] retain];
cell_font = [[NSFont userFontOfSize:0] retain];
return self;
}
@ -119,7 +119,7 @@
[self _init];
cell_font = [[NSFont userFontOfSize:12] retain];
cell_font = [[NSFont userFontOfSize:0] retain];
contents = [aString retain];
cell_type = NSTextCellType;
text_align = NSCenterTextAlignment;

View file

@ -81,7 +81,7 @@
[self setBackgroundColor: [NSColor whiteColor]];
[self setTextColor: [NSColor blackColor]];
[self setFont: [NSFont systemFontOfSize:12]];
[self setFont: [NSFont systemFontOfSize:0]];
draw_background = YES;
return self;
}