* Headers/AppKit/NSPageLayout.h

* Source/NSPageLayout.m: Change int to NSInteger.
        Patch by Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36092 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-02-08 17:50:25 +00:00
parent 6c32c76a0c
commit cda7dc977f
3 changed files with 15 additions and 21 deletions

View file

@ -1,3 +1,9 @@
2013-02-08 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSPageLayout.h
* Source/NSPageLayout.m: Change int to NSInteger.
Patch by Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
2013-02-08 Fred Kiefer <FredKiefer@gmx.de>
* Resources/English.lproj/Localizable.strings

View file

@ -78,8 +78,8 @@ enum {
//
// Running the Panel
//
- (int)runModal;
- (int)runModalWithPrintInfo:(NSPrintInfo *)printInfo;
- (NSInteger)runModal;
- (NSInteger)runModalWithPrintInfo:(NSPrintInfo *)printInfo;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void)beginSheetWithPrintInfo:(NSPrintInfo *)printInfo
modalForWindow:(NSWindow *)docWindow

View file

@ -170,11 +170,11 @@ enum {
-(void) controlTextDidChange:(NSNotification*) notification;
//NSTableView datasource handlers
-(int) numberOfRowsInTableView:(NSTableView*) tableView;
-(NSInteger) numberOfRowsInTableView:(NSTableView*) tableView;
-(id) tableView: (NSTableView*) tableView
objectValueForTableColumn: (NSTableColumn*) tableColumn
row: (int) index;
row: (NSInteger) index;
//NSTabView delegate handler we care about
-(void) tabView: (NSTabView*) tabView
@ -267,7 +267,7 @@ enum {
if the user clicks the Cancel button or NSOKButton otherwise.</p>
<p>See Also: -runModalWithPrintInfo:</p>
*/
- (int)runModal
- (NSInteger)runModal
{
return [self runModalWithPrintInfo: [NSPrintInfo sharedPrintInfo]];
}
@ -277,9 +277,9 @@ enum {
if the user clicks the Cancel button or NSOKButton otherwise.</p>
<p>See Also: -runModal</p>
*/
- (int)runModalWithPrintInfo:(NSPrintInfo *)printInfo
- (NSInteger)runModalWithPrintInfo:(NSPrintInfo *)printInfo
{
int result;
NSInteger result;
[_controller setPrintInfo: printInfo];
[_controller readPrintInfo];
@ -540,13 +540,11 @@ enum {
[NSApp stopModalWithCode: NSOKButton];
}
- (void) cancelButtonClicked: (id)sender
{
[NSApp stopModalWithCode: NSCancelButton];
}
-(void) printerPopUpClicked: (id)sender
{
NSPrinter *printer;
@ -570,8 +568,6 @@ enum {
[self processAttributes];
}
-(void) paperRadioMatrixClicked: (id) sender
{
if ([sender selectedRow] == 0) //Standard Paper Sizes
@ -602,8 +598,6 @@ enum {
{
}
//determine the measurement string and factor value to use
-(void) determineMeasurements
{
@ -650,8 +644,6 @@ enum {
}
//
// Reads in the values of the controls and responds accordingly
// This updates two ivars: (NSTextField*)dimensionsTextField and
@ -776,8 +768,6 @@ enum {
}
}
- (void)readPrintInfo
{
NSString *paperName;
@ -817,7 +807,6 @@ enum {
[paperOrientationMatrix selectCellAtRow: 0
column: 1];
}
//set the scaling
scaleNumber = [[_printInfo dictionary] objectForKey: NSPrintScalingFactor];
@ -940,7 +929,7 @@ enum {
//NSTableView datasource handlers
-(int) numberOfRowsInTableView:(NSTableView*) tableView
-(NSInteger) numberOfRowsInTableView:(NSTableView*) tableView
{
if (tableView == customPaperTableView)
{
@ -955,11 +944,10 @@ enum {
-(id) tableView: (NSTableView*) tableView
objectValueForTableColumn: (NSTableColumn*) tableColumn
row: (int) index
row: (NSInteger) index
{
if (tableView == customPaperTableView)
{
return [[customPapers allKeys] objectAtIndex: index];
}
else //summaryTableView