Author: mlytwyn
Date: Mon Jun 22 17:52:38 2015
New Revision: 38672
URL: http://svn.gna.org/viewcvs/gnustep?rev=38672&view=rev
Log:
Merge with gui main:38613
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSPrinting.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSPrinting.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSPrinting.m?rev=38672&r1=38671&r2=38672&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSPrinting.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSPrinting.m Mon Jun
22 17:52:38 2015
@@ -35,6 +35,7 @@
#import <Foundation/NSUserDefaults.h>
#import "AppKit/NSPanel.h"
#import "GNUstepGUI/GSPrinting.h"
+#import "GNUstepGUI/GSTheme.h"
static NSBundle *printingBundle = nil;
@@ -112,10 +113,10 @@
if ((bundle = [GSPrinting loadPrintingBundle: @"GSCUPS"]))
return bundle;
- if ((bundle = [GSPrinting loadPrintingBundle: @"GSLPR"]))
+ if ((bundle = [GSPrinting loadPrintingBundle: @"GSWIN32"]))
return bundle;
- if ((bundle = [GSPrinting loadPrintingBundle: @"GSWin32"]))
+ if ((bundle = [GSPrinting loadPrintingBundle: @"GSLPR"]))
return bundle;
return nil;
@@ -227,7 +228,7 @@
+(Class) pageLayoutClass
{
- return Nil;
+ return [[GSTheme theme] pageLayoutClass];
}
+(Class) printInfoClass
@@ -235,7 +236,6 @@
return Nil;
}
-
+(Class) printOperationClass
{
return Nil;
@@ -243,9 +243,8 @@
+(Class) printPanelClass
{
- return Nil;
-}
-
+ return [[GSTheme theme] printPanelClass];
+}
+(Class) printerClass
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
