Author: mlytwyn
Date: Thu Jul 2 02:51:10 2015
New Revision: 38738
URL: http://svn.gna.org/viewcvs/gnustep?rev=38738&view=rev
Log:
Merge Source/NSPrintPanel.m Source/NSPrinter.m Source/NSProgressIndicator.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSPrintPanel.m
libs/gui/branches/gnustep_testplant_branch/Source/NSPrinter.m
libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSPrintPanel.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSPrintPanel.m?rev=38738&r1=38737&r2=38738&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSPrintPanel.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSPrintPanel.m Thu Jul
2 02:51:10 2015
@@ -49,6 +49,7 @@
#import "AppKit/NSView.h"
#import "GSGuiPrivate.h"
#import "GNUstepGUI/GSPrinting.h"
+#import "GNUstepGUI/GSTheme.h"
static NSPrintPanel *shared_instance = nil;
@@ -85,12 +86,11 @@
//
/** Load the appropriate bundle for the PrintPanel
and alloc the class from that in our place
- (eg: GSLPRPrintPanel, GSCUPSPrintPanel).
*/
+
+ (id) allocWithZone: (NSZone*) zone
{
Class principalClass;
-
principalClass = [[GSPrinting printingBundle] principalClass];
if (principalClass == nil)
@@ -462,9 +462,9 @@
else
{
NSString *str;
- str = [NSString stringWithFormat: @"%d", _pages.location];
+ str = [NSString stringWithFormat: @"%lu", (unsigned long)
_pages.location];
[[fromRangeForm cellAtIndex: 0] setStringValue: str];
- str = [NSString stringWithFormat: @"%d", NSMaxRange(_pages)-1];
+ str = [NSString stringWithFormat: @"%lu", (unsigned long)
NSMaxRange(_pages)-1];
[[toRangeForm cellAtIndex: 0] setStringValue: str];
}
}
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSPrinter.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSPrinter.m?rev=38738&r1=38737&r2=38738&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSPrinter.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSPrinter.m Thu Jul
2 02:51:10 2015
@@ -1069,6 +1069,11 @@
withScanner: ppdData
withPPDPath: ppdPath];
}
+
+
+ // Skip any other data that don't conform with the specification.
+ [ppdData scanUpToCharactersFromSet: newlineSet
+ intoString: NULL];
}
}
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m?rev=38738&r1=38737&r2=38738&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSProgressIndicator.m
Thu Jul 2 02:51:10 2015
@@ -161,6 +161,7 @@
}
_isRunning = NO;
+// Testplant-MAL-2015-07-01: Keeping testplant branch code...
_count = 0;
[self setNeedsDisplay: YES];
}
@@ -170,6 +171,7 @@
return _usesThreadedAnimation;
}
+// Testplant-MAL-2015-07-01: Keeping testplant branch code...
- (BOOL)isHidden
{
if ((_isRunning == NO) && (_isDisplayedWhenStopped == NO))
@@ -305,6 +307,7 @@
_style = style;
_count = 0;
[self setDisplayedWhenStopped:(style == NSProgressIndicatorBarStyle)];
+// Testplant-MAL-2015-07-01: Keeping testplant branch code...
[self setBezeled:(style == NSProgressIndicatorBarStyle)];
[self sizeToFit];
[self setNeedsDisplay: YES];
@@ -341,6 +344,7 @@
- (void) drawRect: (NSRect)rect
{
double val;
+ // Testplant-MAL-2015-07-01: omitting main branch code...
if (_doubleValue < _minValue)
val = 0.0;
else if (_doubleValue > _maxValue)
@@ -425,6 +429,7 @@
if ([aDecoder allowsKeyedCoding])
{
+ // Testplant-MAL-2015-07-01: Keeping testplant branch code...
// things which Gorm encodes, but IB doesn't care about.
// process Gorm encodings that IB doesn't care about first
// otherwise we overwrite settings read in from XIB...
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
