diff --git a/ChangeLog b/ChangeLog index e056ab6f7..b091759ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2015-02-03 15:23-EST Gregory John Casamento + + * Headers/Additions/GNUstepGUI/GSTheme.h: Add declarations here + for GSPageLayout and GSPrintPanel. + * Printing/GSCUPS/GNUmakefile: Remove uneeded classes + * Printing/GSCUPS/GSCUPSPageLayout.h + * Printing/GSCUPS/GSCUPSPageLayout.m: Remove since it is not + needed. It does nothing. + * Printing/GSCUPS/GSCUPSPrincipalClass.m: Remove uneeded classes + * Printing/GSCUPS/GSCUPSPrintPanel.h + * Printing/GSCUPS/GSCUPSPrintPanel.m: Remove since it is not + needed. It does nothing. + * Printing/GSLPR/GNUmakefile: Remove uneeded classes. + * Printing/GSLPR/GSLPRPageLayout.h + * Printing/GSLPR/GSLPRPageLayout.m: Remove since it is not + needed. It does nothing. + * Printing/GSLPR/GSLPRPrincipalClass.m: Remove uneeded classes + * Printing/GSLPR/GSLPRPrintPanel.h + * Printing/GSLPR/GSLPRPrintPanel.m: Remove since it is not + needed. It does nothing. + * Source/GSThemePrintPanels.m: Remove declaration from here + for GSPrintPanel and GSPageLayout and move it to GSTheme.h + 2015-02-02 18:37-EST Gregory John Casamento * Source/NSPageLayout.m diff --git a/Headers/Additions/GNUstepGUI/GSTheme.h b/Headers/Additions/GNUstepGUI/GSTheme.h index a84573de1..f646a8c7f 100644 --- a/Headers/Additions/GNUstepGUI/GSTheme.h +++ b/Headers/Additions/GNUstepGUI/GSTheme.h @@ -229,6 +229,8 @@ #import // For tab view type #import +#import +#import #if OS_API_VERSION(GS_API_NONE,GS_API_NONE) @class NSArray; @@ -1434,6 +1436,13 @@ withRepeatedImage: (NSImage*)image - (Class) savePanelClass; @end +// Panels which can be overridden by the theme... +@interface GSPrintPanel : NSPrintPanel +@end + +@interface GSPageLayout : NSPageLayout +@end + @interface GSTheme (PrintPanels) /** * This method returns the print panel class needed by the diff --git a/Printing/GSCUPS/GNUmakefile b/Printing/GSCUPS/GNUmakefile index 49e25ce70..536d0eab5 100644 --- a/Printing/GSCUPS/GNUmakefile +++ b/Printing/GSCUPS/GNUmakefile @@ -69,12 +69,10 @@ GSCUPS_BUNDLE_LIBS += $(GSCUPS_LIBS) # Header files # GSCUPS_HEADERS= \ - GSCUPSPrincipalClass.m \ - GSCUPSPageLayout.m \ - GSCUPSPrintInfo.m \ - GSCUPSPrintOperation \ - GSCUPSPrintPanel.m \ - GSCUPSPrinter.m + GSCUPSPrincipalClass.h \ + GSCUPSPrintInfo.h \ + GSCUPSPrintOperation.h \ + GSCUPSPrinter.h # @@ -82,10 +80,8 @@ GSCUPS_HEADERS= \ # GSCUPS_OBJC_FILES= \ GSCUPSPrincipalClass.m \ - GSCUPSPageLayout.m \ GSCUPSPrintInfo.m \ GSCUPSPrintOperation.m \ - GSCUPSPrintPanel.m \ GSCUPSPrinter.m diff --git a/Printing/GSCUPS/GSCUPSPageLayout.h b/Printing/GSCUPS/GSCUPSPageLayout.h deleted file mode 100644 index 508b8bd2a..000000000 --- a/Printing/GSCUPS/GSCUPSPageLayout.h +++ /dev/null @@ -1,41 +0,0 @@ -/** GSCUPSPageLayout - - Standard panel for querying user about page layout. - - Copyright (C) 2004 Free Software Foundation, Inc. - - Written By: Chad Hardin - Date: October 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _GNUstep_H_GSCUPSPageLayout -#define _GNUstep_H_GSCUPSPageLayout - -#import "AppKit/NSPageLayout.h" - - -@interface GSCUPSPageLayout: NSPageLayout -{ -} - -@end - -#endif // _GNUstep_H_GSCUPSPageLayout diff --git a/Printing/GSCUPS/GSCUPSPageLayout.m b/Printing/GSCUPS/GSCUPSPageLayout.m deleted file mode 100644 index 915475bbf..000000000 --- a/Printing/GSCUPS/GSCUPSPageLayout.m +++ /dev/null @@ -1,51 +0,0 @@ -/** GSCUPSPageLayout - - - - Copyright (C) 2004 Free Software Foundation, Inc. - Author: Chad Hardin - Date: October 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#import -#import "GSCUPSPageLayout.h" - - -@implementation GSCUPSPageLayout -// -// Class methods -// -+ (void)initialize -{ - if (self == [GSCUPSPageLayout class]) - { - // Initial version - [self setVersion:1]; - } -} - - -+ (id) allocWithZone: (NSZone*)zone -{ - return NSAllocateObject(self, 0, zone); -} - -@end diff --git a/Printing/GSCUPS/GSCUPSPrincipalClass.m b/Printing/GSCUPS/GSCUPSPrincipalClass.m index 39d94e932..b7c5cd840 100644 --- a/Printing/GSCUPS/GSCUPSPrincipalClass.m +++ b/Printing/GSCUPS/GSCUPSPrincipalClass.m @@ -29,10 +29,8 @@ #import #import "GSCUPSPrincipalClass.h" -#import "GSCUPSPageLayout.h" #import "GSCUPSPrintInfo.h" #import "GSCUPSPrintOperation.h" -#import "GSCUPSPrintPanel.h" #import "GSCUPSPrinter.h" @@ -40,10 +38,6 @@ // // Class methods // -+(Class) pageLayoutClass -{ - return [GSCUPSPageLayout class]; -} +(Class) printInfoClass { @@ -55,19 +49,11 @@ return [GSCUPSPrintOperation class]; } - -+(Class) printPanelClass -{ - return [GSCUPSPrintPanel class]; -} - - +(Class) printerClass { return [GSCUPSPrinter class]; } - +(Class) gsPrintOperationClass { return [GSCUPSPrintOperation class]; diff --git a/Printing/GSCUPS/GSCUPSPrintPanel.h b/Printing/GSCUPS/GSCUPSPrintPanel.h deleted file mode 100644 index ba9abcaa0..000000000 --- a/Printing/GSCUPS/GSCUPSPrintPanel.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - GSCUPSPrintPanel.h - - Standard panel to query users for info on a print job - - Copyright (C) 2004 Free Software Foundation, Inc. - - Author: Chad Hardin - Date: October 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _GNUstep_H_GSCUPSPrintPanel -#define _GNUstep_H_GSCUPSPrintPanel - -#import "AppKit/NSPrintPanel.h" - - -@interface GSCUPSPrintPanel : NSPrintPanel -{ -} - -@end - -#endif // _GNUstep_H_GSCUPSPrintPanel diff --git a/Printing/GSCUPS/GSCUPSPrintPanel.m b/Printing/GSCUPS/GSCUPSPrintPanel.m deleted file mode 100644 index 9f6720a7c..000000000 --- a/Printing/GSCUPS/GSCUPSPrintPanel.m +++ /dev/null @@ -1,42 +0,0 @@ -/** GSCUPSPrintPanel - - Standard panel for querying user about printing. - - Copyright (C) 2004 Free Software Foundation, Inc. - - Author: Chad Hardin - Date: October 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#import -#import "GSCUPSPrintPanel.h" - - -@implementation GSCUPSPrintPanel -// -// Class methods -// -+ (id) allocWithZone: (NSZone*)zone -{ - return NSAllocateObject(self, 0, zone); -} - -@end diff --git a/Printing/GSLPR/GNUmakefile b/Printing/GSLPR/GNUmakefile index 6a63ed27d..6601dda0b 100644 --- a/Printing/GSLPR/GNUmakefile +++ b/Printing/GSLPR/GNUmakefile @@ -57,22 +57,18 @@ endif # Header files # GSLPR_HEADERS= \ - GSLPRPrincipalClass.m \ - GSLPRPageLayout.m \ - GSLPRPrintInfo.m \ - GSLPRPrintOperation \ - GSLPRPrintPanel.m \ - GSLPRPrinter.m + GSLPRPrincipalClass.h \ + GSLPRPrintInfo.h \ + GSLPRPrintOperation.h \ + GSLPRPrinter.h # # Class files # GSLPR_OBJC_FILES= \ GSLPRPrincipalClass.m \ - GSLPRPageLayout.m \ GSLPRPrintInfo.m \ GSLPRPrintOperation.m \ - GSLPRPrintPanel.m \ GSLPRPrinter.m # diff --git a/Printing/GSLPR/GSLPRPageLayout.h b/Printing/GSLPR/GSLPRPageLayout.h deleted file mode 100644 index 3ed67284e..000000000 --- a/Printing/GSLPR/GSLPRPageLayout.h +++ /dev/null @@ -1,46 +0,0 @@ -/** GSLPRPageLayout - - Standard panel for querying user about page layout. - - Copyright (C) 2001,2004 Free Software Foundation, Inc. - - Written By: Adam Fedor - Date: Oct 2001 - Modified for Printing Backend Support - Author: Chad Hardin - Date: June 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _GNUstep_H_GSLPRPageLayout -#define _GNUstep_H_GSLPRPageLayout - -#import "AppKit/NSPageLayout.h" - -@class NSPrintInfo; -@class NSView; - -@interface GSLPRPageLayout: NSPageLayout -{ -} - -@end - -#endif // _GNUstep_H_GSLPRPageLayout diff --git a/Printing/GSLPR/GSLPRPageLayout.m b/Printing/GSLPR/GSLPRPageLayout.m deleted file mode 100644 index 01a036e09..000000000 --- a/Printing/GSLPR/GSLPRPageLayout.m +++ /dev/null @@ -1,51 +0,0 @@ -/** GSLPRPageLayout - - - - Copyright (C) 2004 Free Software Foundation, Inc. - Author: Chad Hardin - Date: June 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#import -#import "GSLPRPageLayout.h" - - -@implementation GSLPRPageLayout -// -// Class methods -// -+ (void)initialize -{ - if (self == [GSLPRPageLayout class]) - { - // Initial version - [self setVersion:1]; - } -} - - -+ (id) allocWithZone: (NSZone*)zone -{ - return NSAllocateObject(self, 0, zone); -} - -@end diff --git a/Printing/GSLPR/GSLPRPrincipalClass.m b/Printing/GSLPR/GSLPRPrincipalClass.m index 54716ef38..bb633b3d2 100644 --- a/Printing/GSLPR/GSLPRPrincipalClass.m +++ b/Printing/GSLPR/GSLPRPrincipalClass.m @@ -29,10 +29,8 @@ #import #import "GSLPRPrincipalClass.h" -#import "GSLPRPageLayout.h" #import "GSLPRPrintInfo.h" #import "GSLPRPrintOperation.h" -#import "GSLPRPrintPanel.h" #import "GSLPRPrinter.h" @@ -40,11 +38,6 @@ // // Class methods // -+(Class) pageLayoutClass -{ - return [GSLPRPageLayout class]; -} - +(Class) printInfoClass { return [GSLPRPrintInfo class]; @@ -55,19 +48,11 @@ return [GSLPRPrintOperation class]; } - -+(Class) printPanelClass -{ - return [GSLPRPrintPanel class]; -} - - +(Class) printerClass { return [GSLPRPrinter class]; } - +(Class) gsPrintOperationClass { return [GSLPRPrintOperation class]; diff --git a/Printing/GSLPR/GSLPRPrintPanel.h b/Printing/GSLPR/GSLPRPrintPanel.h deleted file mode 100644 index 2390ac240..000000000 --- a/Printing/GSLPR/GSLPRPrintPanel.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - GSLPRPrintPanel.h - - Standard panel to query users for info on a print job - - Copyright (C) 1996,2004 Free Software Foundation, Inc. - - Author: Scott Christley - Date: 1996 - Modified for Printing Backend Support - Author: Chad Hardin - Date: June 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _GNUstep_H_GSLPRPrintPanel -#define _GNUstep_H_GSLPRPrintPanel - -#import "AppKit/NSPrintPanel.h" - -@interface GSLPRPrintPanel : NSPrintPanel -{ -} - -@end - -#endif // _GNUstep_H_GSLPRPrintPanel diff --git a/Printing/GSLPR/GSLPRPrintPanel.m b/Printing/GSLPR/GSLPRPrintPanel.m deleted file mode 100644 index 3a526317b..000000000 --- a/Printing/GSLPR/GSLPRPrintPanel.m +++ /dev/null @@ -1,45 +0,0 @@ -/** GSLPRPrintPanel - - Standard panel for querying user about printing. - - Copyright (C) 2001,2004 Free Software Foundation, Inc. - - Written By: Adam Fedor - Date: Oct 2001 - Modified for Printing Backend Support - Author: Chad Hardin - Date: June 2004 - - This file is part of the GNUstep GUI Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; see the file COPYING.LIB. - If not, see or write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#import -#import "GSLPRPrintPanel.h" - - -@implementation GSLPRPrintPanel -// -// Class methods -// -+ (id) allocWithZone: (NSZone*)zone -{ - return NSAllocateObject(self, 0, zone); -} - -@end diff --git a/Source/GSThemePrintPanels.m b/Source/GSThemePrintPanels.m index 867d58ecb..39332146f 100644 --- a/Source/GSThemePrintPanels.m +++ b/Source/GSThemePrintPanels.m @@ -30,12 +30,6 @@ #import "AppKit/NSPageLayout.h" #import "GNUstepGUI/GSTheme.h" -@interface GSPrintPanel : NSPrintPanel -@end - -@interface GSPageLayout : NSPageLayout -@end - @implementation GSPrintPanel + (id) allocWithZone: (NSZone*)zone