mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 07:00:46 +00:00
Merge with gui main:38613
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38672 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
366a02d090
commit
31e58c2158
1 changed files with 5 additions and 6 deletions
|
@ -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 @@ static NSBundle *printingBundle = nil;
|
|||
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 @@ static NSBundle *printingBundle = nil;
|
|||
|
||||
+(Class) pageLayoutClass
|
||||
{
|
||||
return Nil;
|
||||
return [[GSTheme theme] pageLayoutClass];
|
||||
}
|
||||
|
||||
+(Class) printInfoClass
|
||||
|
@ -235,7 +236,6 @@ static NSBundle *printingBundle = nil;
|
|||
return Nil;
|
||||
}
|
||||
|
||||
|
||||
+(Class) printOperationClass
|
||||
{
|
||||
return Nil;
|
||||
|
@ -243,10 +243,9 @@ static NSBundle *printingBundle = nil;
|
|||
|
||||
+(Class) printPanelClass
|
||||
{
|
||||
return Nil;
|
||||
return [[GSTheme theme] printPanelClass];
|
||||
}
|
||||
|
||||
|
||||
+(Class) printerClass
|
||||
{
|
||||
return Nil;
|
||||
|
|
Loading…
Reference in a new issue