Author: gcasa
Date: Wed Feb 4 02:22:46 2015
New Revision: 38328
URL: http://svn.gna.org/viewcvs/gnustep?rev=38328&view=rev
Log:
Remove classes from the win32 printing bundle which belong in the theme.
Removed:
libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.h
libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.m
libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.h
libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.m
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Printing/GSWIN32/GNUmakefile
libs/gui/trunk/Printing/GSWIN32/GSWIN32PrincipalClass.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38328&r1=38327&r2=38328&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Wed Feb 4 02:22:46 2015
@@ -1,3 +1,11 @@
+2015-02-03 20:20-EST Gregory John Casamento <[email protected]>
+
+ * Printing/GSWIN32/GSWIN32PrincipalClass.m: Remove calls to
+ instantiate GSWIN32PageLayout and GSWIN32PrintPanel classes.
+ * Printing/GSWIN32/GSWIN32PrintPanel.[hm]: Removed.
+ * Printing/GSWIN32/GSWIN32PageLayout.[hm]: Removed.
+ * Printing/GSWIN32/GNUmakefile: Remove classes from compilation.
+
2015-02-03 15:23-EST Gregory John Casamento <[email protected]>
* Headers/Additions/GNUstepGUI/GSTheme.h: Add declarations here
Modified: libs/gui/trunk/Printing/GSWIN32/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Printing/GSWIN32/GNUmakefile?rev=38328&r1=38327&r2=38328&view=diff
==============================================================================
--- libs/gui/trunk/Printing/GSWIN32/GNUmakefile (original)
+++ libs/gui/trunk/Printing/GSWIN32/GNUmakefile Wed Feb 4 02:22:46 2015
@@ -57,22 +57,18 @@
# Header files
#
GSWIN32_HEADERS= \
- GSWIN32PrincipalClass.m \
- GSWIN32PageLayout.m \
- GSWIN32PrintInfo.m \
- GSWIN32PrintOperation \
- GSWIN32PrintPanel.m \
- GSWIN32Printer.m
+ GSWIN32PrincipalClass.h \
+ GSWIN32PrintInfo.h \
+ GSWIN32PrintOperation.h \
+ GSWIN32Printer.h
#
# Class files
#
GSWIN32_OBJC_FILES= \
GSWIN32PrincipalClass.m \
- GSWIN32PageLayout.m \
GSWIN32PrintInfo.m \
GSWIN32PrintOperation.m \
- GSWIN32PrintPanel.m \
GSWIN32Printer.m
#
Removed: libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.h?rev=38327&view=auto
==============================================================================
--- libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.h (original)
+++ libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.h (removed)
@@ -1,46 +0,0 @@
-/** <title>GSWIN32PageLayout</title>
-
- <abstract>Standard panel for querying user about page layout.</abstract>
-
- Copyright (C) 2001,2004 Free Software Foundation, Inc.
-
- Written By: Adam Fedor <[email protected]>
- Date: Oct 2001
- Modified for Printing Backend Support
- Author: Chad Hardin <[email protected]>
- 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_GSWIN32PageLayout
-#define _GNUstep_H_GSWIN32PageLayout
-
-#import "AppKit/NSPageLayout.h"
-
-@class NSPrintInfo;
-@class NSView;
-
-@interface GSWIN32PageLayout: NSPageLayout
-{
-}
-
-@end
-
-#endif // _GNUstep_H_GSWIN32PageLayout
Removed: libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.m?rev=38327&view=auto
==============================================================================
--- libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.m (original)
+++ libs/gui/trunk/Printing/GSWIN32/GSWIN32PageLayout.m (removed)
@@ -1,103 +0,0 @@
-/** <title>GSWIN32PageLayout</title>
-
- <abstract></abstract>
-
- Copyright (C) 2004 Free Software Foundation, Inc.
- Author: Chad Hardin <[email protected]>
- 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 <Foundation/NSValue.h>
-#import <AppKit/NSPrintInfo.h>
-#import <AppKit/NSPrinter.h>
-#import <AppKit/NSApplication.h>
-
-#import "GSWIN32Printer.h"
-#import "GSWIN32PageLayout.h"
-
-#define PTS2INCHES(n) ((n / 72.0f) * 1000.0f)
-#define INCHES2PTS(n) ((n / 1000.0f) * 72.0f)
-
-@implementation GSWIN32PageLayout
-//
-// Class methods
-//
-+ (void)initialize
-{
- if (self == [GSWIN32PageLayout class])
- {
- // Initial version
- [self setVersion:1];
- }
-}
-
-
-+ (id) allocWithZone: (NSZone*)zone
-{
- return NSAllocateObject(self, 0, zone);
-}
-
-- (NSInteger)runModalWithPrintInfo:(NSPrintInfo *)printInfo
-{
- PAGESETUPDLG pgSetup;
- int windowNumber =
- [[[NSApplication sharedApplication] mainWindow] windowNumber];
-
- pgSetup.lStructSize = sizeof(PAGESETUPDLG);
- pgSetup.Flags = PSD_INTHOUSANDTHSOFINCHES;
- pgSetup.hwndOwner = (HWND)windowNumber;
- pgSetup.hDevNames = NULL;
- pgSetup.hDevMode = NULL;
- pgSetup.rtMargin.top = PTS2INCHES([printInfo topMargin]);
- pgSetup.rtMargin.bottom = PTS2INCHES([printInfo bottomMargin]);
- pgSetup.rtMargin.right = PTS2INCHES([printInfo rightMargin]);
- pgSetup.rtMargin.left = PTS2INCHES([printInfo leftMargin]);
- pgSetup.ptPaperSize.x = PTS2INCHES([printInfo paperSize].width);
- pgSetup.ptPaperSize.y = PTS2INCHES([printInfo paperSize].height);
-
- int retVal = PageSetupDlg(&pgSetup);
- if (retVal == 0)
- {
- return NSCancelButton;
- }
- else
- {
- NSSize size = NSMakeSize(INCHES2PTS(pgSetup.ptPaperSize.x),
- INCHES2PTS(pgSetup.ptPaperSize.y));
- [printInfo setPaperSize: size];
- [printInfo setTopMargin: INCHES2PTS(pgSetup.rtMargin.top)];
- [printInfo setBottomMargin: INCHES2PTS(pgSetup.rtMargin.bottom)];
- [printInfo setRightMargin: INCHES2PTS(pgSetup.rtMargin.right)];
- [printInfo setLeftMargin: INCHES2PTS(pgSetup.rtMargin.left)];
- }
- return NSOKButton;
-}
-
-- (void) beginSheetWithPrintInfo: (NSPrintInfo *)printInfo
- modalForWindow: (NSWindow *)docWindow
- delegate: (id)delegate
- didEndSelector: (SEL)didEndSelector
- contextInfo: (void *)contextInfo
-{
- [self runModalWithPrintInfo: printInfo];
-}
-@end
Modified: libs/gui/trunk/Printing/GSWIN32/GSWIN32PrincipalClass.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Printing/GSWIN32/GSWIN32PrincipalClass.m?rev=38328&r1=38327&r2=38328&view=diff
==============================================================================
--- libs/gui/trunk/Printing/GSWIN32/GSWIN32PrincipalClass.m (original)
+++ libs/gui/trunk/Printing/GSWIN32/GSWIN32PrincipalClass.m Wed Feb 4
02:22:46 2015
@@ -29,10 +29,8 @@
#import <Foundation/NSDebug.h>
#import "GSWIN32PrincipalClass.h"
-#import "GSWIN32PageLayout.h"
#import "GSWIN32PrintInfo.h"
#import "GSWIN32PrintOperation.h"
-#import "GSWIN32PrintPanel.h"
#import "GSWIN32Printer.h"
@@ -40,11 +38,6 @@
//
// Class methods
//
-+(Class) pageLayoutClass
-{
- return [GSWIN32PageLayout class];
-}
-
+(Class) printInfoClass
{
return [GSWIN32PrintInfo class];
@@ -53,11 +46,6 @@
+(Class) printOperationClass
{
return [GSWIN32PrintOperation class];
-}
-
-+(Class) printPanelClass
-{
- return [GSWIN32PrintPanel class];
}
+(Class) printerClass
Removed: libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.h?rev=38327&view=auto
==============================================================================
--- libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.h (original)
+++ libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.h (removed)
@@ -1,44 +0,0 @@
-/*
- GSWIN32PrintPanel.h
-
- Standard panel to query users for info on a print job
-
- Copyright (C) 1996,2004 Free Software Foundation, Inc.
-
- Author: Scott Christley <[email protected]>
- Date: 1996
- Modified for Printing Backend Support
- Author: Chad Hardin <[email protected]>
- 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_GSWIN32PrintPanel
-#define _GNUstep_H_GSWIN32PrintPanel
-
-#import "AppKit/NSPrintPanel.h"
-
-@interface GSWIN32PrintPanel : NSPrintPanel
-{
-}
-
-@end
-
-#endif // _GNUstep_H_GSWIN32PrintPanel
Removed: libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.m?rev=38327&view=auto
==============================================================================
--- libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.m (original)
+++ libs/gui/trunk/Printing/GSWIN32/GSWIN32PrintPanel.m (removed)
@@ -1,111 +0,0 @@
-/** <title>GSWIN32PrintPanel</title>
-
- <abstract>Standard panel for querying user about printing.</abstract>
-
- Copyright (C) 2001,2004 Free Software Foundation, Inc.
-
- Written By: Adam Fedor <[email protected]>
- Date: Oct 2001
- Modified for Printing Backend Support
- Author: Chad Hardin <[email protected]>
- 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 <Foundation/NSValue.h>
-#import <AppKit/NSPrintInfo.h>
-#import <AppKit/NSPrinter.h>
-#import <AppKit/NSApplication.h>
-
-#import "GSWIN32PrintPanel.h"
-#import "GSWIN32Printer.h"
-
-@implementation GSWIN32PrintPanel
-//
-// Class methods
-//
-+ (id) allocWithZone: (NSZone*)zone
-{
- return NSAllocateObject(self, 0, zone);
-}
-
-- (NSInteger) runModalWithPrintInfo: (NSPrintInfo *)printInfo
-{
- int retVal;
- PRINTDLG printDlg;
- int windowNumber = [[[NSApplication sharedApplication]
mainWindow] windowNumber];
-
- printDlg.lStructSize = sizeof(PRINTDLG);
- printDlg.hwndOwner = (HWND)windowNumber;
- printDlg.hDevMode = NULL;
- printDlg.hDevNames = NULL;
- printDlg.Flags = PD_RETURNDC | PD_USEDEVMODECOPIESANDCOLLATE;
- printDlg.hDC = NULL;
- printDlg.lCustData = 0;
- printDlg.lpfnPrintHook = NULL;
- printDlg.lpfnSetupHook = NULL;
- printDlg.lpPrintTemplateName = NULL;
- printDlg.lpSetupTemplateName = NULL;
- printDlg.hPrintTemplate = NULL;
- printDlg.hSetupTemplate = NULL;
-
- printDlg.nFromPage = 0; //0xFFFF;
- printDlg.nToPage = 0; //0xFFFF;
- printDlg.nMinPage = 1;
- printDlg.nMaxPage = 0xFFFF;
- printDlg.nCopies = 1;
- printDlg.hInstance = NULL;
-
- retVal = PrintDlg(&printDlg);
- if(retVal==0)
- {
- return NSCancelButton;
- }
- else
- {
- DEVNAMES *pDevNames = (DEVNAMES *)GlobalLock(printDlg.hDevNames);
- LPCTSTR szDevice = NULL;
- NSString *printerName = nil;
- NSPrinter *printer = nil;
-
- szDevice = (LPCTSTR)pDevNames + pDevNames->wDeviceOffset;
- printerName = [NSString stringWithCString:(const char *)szDevice];
- NSLog(@"Printer Name = %@",printerName);
-
- printer = [NSPrinter printerWithName:printerName];
- if(printer != nil)
- {
- [printInfo setPrinter:printer];
- }
- }
-
- return NSOKButton;
-}
-
-- (void) beginSheetWithPrintInfo: (NSPrintInfo *)printInfo
- modalForWindow: (NSWindow *)docWindow
- delegate: (id)delegate
- didEndSelector: (SEL)didEndSelector
- contextInfo: (void *)contextInfo
-{
- [self runModalWithPrintInfo: printInfo];
-}
-@end
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
