mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 13:10:59 +00:00
Move declarations of GSPrintPanel and GSPageLayout to theme and remove uneeded classes since they are not used and only override allocWithZone:.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38324 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento
parent
643cac4468
commit
5d9a261362
15 changed files with 40 additions and 413 deletions
23
ChangeLog
23
ChangeLog
|
|
@ -1,3 +1,26 @@
|
|||
2015-02-03 15:23-EST Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* 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 <greg.casamento@gmail.com>
|
||||
|
||||
* Source/NSPageLayout.m
|
||||
|
|
|
|||
|
|
@ -229,6 +229,8 @@
|
|||
#import <AppKit/NSSegmentedControl.h>
|
||||
// For tab view type
|
||||
#import <AppKit/NSTabView.h>
|
||||
#import <AppKit/NSPrintPanel.h>
|
||||
#import <AppKit/NSPageLayout.h>
|
||||
|
||||
#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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
/** <title>GSCUPSPageLayout</title>
|
||||
|
||||
<abstract>Standard panel for querying user about page layout.</abstract>
|
||||
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
Written By: Chad Hardin <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> 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
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
/** <title>GSCUPSPageLayout</title>
|
||||
|
||||
<abstract></abstract>
|
||||
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
Author: Chad Hardin <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> or write to the
|
||||
Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSDebug.h>
|
||||
#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
|
||||
|
|
@ -29,10 +29,8 @@
|
|||
|
||||
#import <Foundation/NSDebug.h>
|
||||
#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];
|
||||
|
|
|
|||
|
|
@ -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 <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> 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
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
/** <title>GSCUPSPrintPanel</title>
|
||||
|
||||
<abstract>Standard panel for querying user about printing.</abstract>
|
||||
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
Author: Chad Hardin <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> or write to the
|
||||
Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSDebug.h>
|
||||
#import "GSCUPSPrintPanel.h"
|
||||
|
||||
|
||||
@implementation GSCUPSPrintPanel
|
||||
//
|
||||
// Class methods
|
||||
//
|
||||
+ (id) allocWithZone: (NSZone*)zone
|
||||
{
|
||||
return NSAllocateObject(self, 0, zone);
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -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
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
/** <title>GSLPRPageLayout</title>
|
||||
|
||||
<abstract>Standard panel for querying user about page layout.</abstract>
|
||||
|
||||
Copyright (C) 2001,2004 Free Software Foundation, Inc.
|
||||
|
||||
Written By: Adam Fedor <fedor@gnu.org>
|
||||
Date: Oct 2001
|
||||
Modified for Printing Backend Support
|
||||
Author: Chad Hardin <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> 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
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
/** <title>GSLPRPageLayout</title>
|
||||
|
||||
<abstract></abstract>
|
||||
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
Author: Chad Hardin <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> or write to the
|
||||
Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSDebug.h>
|
||||
#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
|
||||
|
|
@ -29,10 +29,8 @@
|
|||
|
||||
#import <Foundation/NSDebug.h>
|
||||
#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];
|
||||
|
|
|
|||
|
|
@ -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 <scottc@net-community.com>
|
||||
Date: 1996
|
||||
Modified for Printing Backend Support
|
||||
Author: Chad Hardin <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> 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
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/** <title>GSLPRPrintPanel</title>
|
||||
|
||||
<abstract>Standard panel for querying user about printing.</abstract>
|
||||
|
||||
Copyright (C) 2001,2004 Free Software Foundation, Inc.
|
||||
|
||||
Written By: Adam Fedor <fedor@gnu.org>
|
||||
Date: Oct 2001
|
||||
Modified for Printing Backend Support
|
||||
Author: Chad Hardin <cehardin@mac.com>
|
||||
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 <http://www.gnu.org/licenses/> or write to the
|
||||
Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSDebug.h>
|
||||
#import "GSLPRPrintPanel.h"
|
||||
|
||||
|
||||
@implementation GSLPRPrintPanel
|
||||
//
|
||||
// Class methods
|
||||
//
|
||||
+ (id) allocWithZone: (NSZone*)zone
|
||||
{
|
||||
return NSAllocateObject(self, 0, zone);
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue