Author: mlytwyn Date: Thu Jul 2 02:24:09 2015 New Revision: 38736 URL: http://svn.gna.org/viewcvs/gnustep?rev=38736&view=rev Log: Merge Source/NSPageLayout.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSPageLayout.m Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSPageLayout.m URL: http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSPageLayout.m?rev=38736&r1=38735&r2=38736&view=diff ============================================================================== --- libs/gui/branches/gnustep_testplant_branch/Source/NSPageLayout.m (original) +++ libs/gui/branches/gnustep_testplant_branch/Source/NSPageLayout.m Thu Jul 2 02:24:09 2015 @@ -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 @@ NSPrintInfo *_printInfo; NSView *_accessoryView; } + -(NSPageLayout*) panel; //IBActions @@ -229,12 +231,11 @@ // 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) @@ -242,7 +243,6 @@ return [[principalClass pageLayoutClass] allocWithZone: zone]; } - /** Creates ( if needed ) and returns a shared instance of the NSPageLayout panel. _______________________________________________ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs