Author: mlytwyn
Date: Wed Jul 1 00:25:22 2015
New Revision: 38728
URL: http://svn.gna.org/viewcvs/gnustep?rev=38728&view=rev
Log:
Merge Headers/AppKit/NSFontPanel.h Source/NSFontPanel.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSFontPanel.h
libs/gui/branches/gnustep_testplant_branch/Source/NSFontPanel.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSFontPanel.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSFontPanel.h?rev=38728&r1=38727&r2=38728&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSFontPanel.h
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSFontPanel.h
Wed Jul 1 00:25:22 2015
@@ -56,7 +56,7 @@
NSFPSizeBrowser
};
-@interface NSFontPanel : NSPanel <NSCoding, NSTextFieldDelegate>
+@interface NSFontPanel : NSPanel <NSTextFieldDelegate>
{
// Attributes
NSFont *_panelFont;
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSFontPanel.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSFontPanel.m?rev=38728&r1=38727&r2=38728&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSFontPanel.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSFontPanel.m Wed Jul
1 00:25:22 2015
@@ -648,7 +648,6 @@
[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 @@
}
-- (int) browser: (NSBrowser*)sender numberOfRowsInColumn: (int)column
+- (NSInteger) browser: (NSBrowser*)sender numberOfRowsInColumn:
(NSInteger)column
{
switch ([sender tag])
{
@@ -1130,7 +1129,7 @@
}
}
-- (NSString*) browser: (NSBrowser*)sender titleOfColumn: (int)column
+- (NSString*) browser: (NSBrowser*)sender titleOfColumn: (NSInteger)column
{
switch ([sender tag])
{
@@ -1189,7 +1188,7 @@
}
- (BOOL) browser: (NSBrowser *)sender
- isColumnValid: (int)column;
+ isColumnValid: (NSInteger)column;
{
return NO;
}
@@ -1199,9 +1198,9 @@
@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;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
