Merge Source/NSPageLayout.m

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38736 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-07-02 00:24:09 +00:00
parent 527b0def04
commit 9fe74e0c52

View file

@ -59,6 +59,7 @@
#import "AppKit/NSPrinter.h"
#import "GSGuiPrivate.h"
#import "GNUstepGUI/GSPrinting.h"
#import "GNUstepGUI/GSTheme.h"
static NSPageLayout *shared_instance;
@ -139,6 +140,7 @@ enum {
NSPrintInfo *_printInfo;
NSView *_accessoryView;
}
-(NSPageLayout*) panel;
//IBActions
@ -229,12 +231,11 @@ enum {
// Class methods
//
/** Load the appropriate bundle for the PageLayout
(eg: GSLPRPageLayout, GSCUPSPageLayout).
*/
+ (id) allocWithZone: (NSZone*) zone
{
Class principalClass;
principalClass = [[GSPrinting printingBundle] principalClass];
if (principalClass == nil)
@ -243,7 +244,6 @@ enum {
return [[principalClass pageLayoutClass] allocWithZone: zone];
}
/** Creates ( if needed ) and returns a shared instance of the
NSPageLayout panel.
*/