gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 03:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge Headers/AppKit/NSFontPanel.h Source/NSFontPanel.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38728 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-30 22:25:22 +00:00
parent f59bd5478c
commit 1a6aa35155
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Headers/AppKit/NSFontPanel.h
View file

@ -56,7 +56,7 @@ enum {
NSFPSizeBrowser
};
@interface NSFontPanel : NSPanel <NSCoding, NSTextFieldDelegate>
@interface NSFontPanel : NSPanel <NSTextFieldDelegate>
{
// Attributes
NSFont *_panelFont;

13
Source/NSFontPanel.m
View file

@ -648,7 +648,6 @@ static float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
[sizeField setEditable: YES];
[sizeField setAllowsEditingTextAttributes: NO];
[sizeField setAlignment: NSCenterTextAlignment];
[sizeField setBackgroundColor: [NSColor windowFrameTextColor]];
[sizeField setAutoresizingMask: NSViewMinXMargin | NSViewMinYMargin];
[sizeField setDelegate: self];
[sizeField setTag: NSFPSizeField];
@ -1107,7 +1106,7 @@ static int score_difference(int weight1, int traits1,
}
- (int) browser: (NSBrowser*)sender numberOfRowsInColumn: (int)column
- (NSInteger) browser: (NSBrowser*)sender numberOfRowsInColumn: (NSInteger)column
{
switch ([sender tag])
{
@ -1130,7 +1129,7 @@ static int score_difference(int weight1, int traits1,
}
}
- (NSString*) browser: (NSBrowser*)sender titleOfColumn: (int)column
- (NSString*) browser: (NSBrowser*)sender titleOfColumn: (NSInteger)column
{
switch ([sender tag])
{
@ -1189,7 +1188,7 @@ static int score_difference(int weight1, int traits1,
}
- (BOOL) browser: (NSBrowser *)sender
isColumnValid: (int)column;
isColumnValid: (NSInteger)column;
{
return NO;
}
@ -1199,9 +1198,9 @@ static int score_difference(int weight1, int traits1,
@implementation NSFontPanel (NSSplitViewDelegate)
- (void) splitView: (NSSplitView *)splitView
constrainMinCoordinate: (float *)min
maxCoordinate: (float *)max
ofSubviewAt: (int)offset
constrainMinCoordinate: (CGFloat *)min
maxCoordinate: (CGFloat *)max
ofSubviewAt: (NSInteger)offset
{
*max = *max - 100;
}