Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 27 Nov 2015 23:22:56 +0000
branchjv
changeset 3528 378efd6fd2f1
parent 3525 642f9346516c (current diff)
parent 3527 aa939bace1e9 (diff)
child 3531 ecdaa72ad4d8
Merge
WinPrinterContext.st
--- a/ApplicationModel.st	Sat Nov 21 06:50:48 2015 +0100
+++ b/ApplicationModel.st	Fri Nov 27 23:22:56 2015 +0000
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
 	      All Rights Reserved
@@ -2018,7 +2020,7 @@
         ^ self
     ].
 
-    (window := self window) notNil ifTrue:[
+    ((window := self window) notNil and:[window isOpen]) ifTrue:[
         sensor := window sensor.
     ].
 
--- a/WinPrinterContext.st	Sat Nov 21 06:50:48 2015 +0100
+++ b/WinPrinterContext.st	Fri Nov 27 23:22:56 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libview2' }"
 
+"{ NameSpace: Smalltalk }"
+
 PrinterContext subclass:#WinPrinterContext
 	instanceVariableNames:'deviceFonts hatch supportsColor'
 	classVariableNames:'PostScriptBlackWhite'
@@ -277,7 +279,7 @@
 
     printerInfo := PrintingDialog getPrinterInfo.
     printerInfo isNil ifTrue:[^self].
-    printer := WinPrinterContext fromPrinterInfo: printerInfo.
+    printer := self fromPrinterInfo: printerInfo.
     ^ printer
 !
 
@@ -286,6 +288,10 @@
 !
 
 openGraphicContextWithoutDialog:withoutDialog
+    ^ self openGraphicContextWithoutDialog:withoutDialog jobName:nil
+!
+
+openGraphicContextWithoutDialog:withoutDialog jobName:jobName
     |printerInfo gc|
 
     printerInfo := PrintingDialog getPrinterInfoWithoutDialog:withoutDialog.
@@ -293,7 +299,7 @@
     gc := WinPrinterGraphicContext fromPrinterInfo:printerInfo.
 
     gc notNil ifTrue:[
-	gc startPrintJob
+        gc startPrintJob:jobName
     ].
     ^ gc
 ! !
@@ -6132,10 +6138,10 @@
 !WinPrinterContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.44 2013/07/04 10:57:17 mb Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/WinPrinterContext.st,v 1.44 2013/07/04 10:57:17 mb Exp $'
+    ^ '$Header$'
 ! !