# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1460535682 -3600
# Node ID 3a44cd850d0a3f58205e9d198091c5d62541f459
# Parent  79f73b8182e263be6b73f362db9952a41939c47a# Parent  1639efee54f2b9ff2c60b1e9e717c1879f58d4fa
Merge

diff -r 79f73b8182e2 -r 3a44cd850d0a abbrev.stc
--- a/abbrev.stc	Mon Apr 11 08:44:00 2016 +0100
+++ b/abbrev.stc	Wed Apr 13 09:21:22 2016 +0100
@@ -39,7 +39,7 @@
 TIFFReader TIFFReader stx:libview2 'Graphics-Images-Readers' 0
 TransparentBox TransparentBox stx:libview2 'Views-Basic' 2
 VisualRegion VisualRegion stx:libview2 'Views-Special' 2
-WinPrinterStream WinPrinterStream stx:libview2  'unknownCategory'  0
+WinPrinterStream WinPrinterStream stx:libview2 'Interface-Printing' 8
 WindowBuilder WindowBuilder stx:libview2 'Interface-Framework' 0
 WindowsIconReader WindowsIconReader stx:libview2 'Graphics-Images-Readers' 0
 XBMReader XBMReader stx:libview2 'Graphics-Images-Readers' 0
@@ -55,7 +55,7 @@
 UIBuilder UIBuilder stx:libview2 'Interface-Framework' 0
 ValueModel ValueModel stx:libview2 'Interface-Support-Models' 0
 VisualComponent VisualComponent stx:libview2 'Compatibility-ST80-Graphics-Display Objects' 0
-WinPrinterContext WinPrinterContext stx:libview2  'unknownCategory'  0
+WinPrinterContext WinPrinterContext stx:libview2 'Interface-Printing' 0
 AlignmentOrigin AlignmentOrigin stx:libview2 'Graphics-Geometry' 0
 ApplicationWithFileHistory ApplicationWithFileHistory stx:libview2 'Interface-Framework' 2
 BlockValue BlockValue stx:libview2 'Interface-Support-Models' 0
diff -r 79f73b8182e2 -r 3a44cd850d0a bc.mak
--- a/bc.mak	Mon Apr 11 08:44:00 2016 +0100
+++ b/bc.mak	Wed Apr 13 09:21:22 2016 +0100
@@ -37,6 +37,7 @@
 RESFILES=libview2.$(RES)
 
 
+# LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
 LIBJPEG_DIR=$(TOP)\support\libjpeg-9
 
 !if defined(USEMINGW32) || defined(USEMINGW64)
@@ -187,8 +188,8 @@
 $(OUTDIR)ValueHolderWithRememberedPreviousValue.$(O) ValueHolderWithRememberedPreviousValue.$(C) ValueHolderWithRememberedPreviousValue.$(H): ValueHolderWithRememberedPreviousValue.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\ValueHolder.$(H) $(INCLUDE_TOP)\stx\libview2\ValueModel.$(H) $(STCHDR)
 $(OUTDIR)ValueHolderWithWeakDependents.$(O) ValueHolderWithWeakDependents.$(C) ValueHolderWithWeakDependents.$(H): ValueHolderWithWeakDependents.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\ValueHolder.$(H) $(INCLUDE_TOP)\stx\libview2\ValueModel.$(H) $(STCHDR)
 $(OUTDIR)AspectAdaptorWithDefault.$(O) AspectAdaptorWithDefault.$(C) AspectAdaptorWithDefault.$(H): AspectAdaptorWithDefault.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\AspectAdaptor.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\ProtocolAdaptor.$(H) $(INCLUDE_TOP)\stx\libview2\ValueModel.$(H) $(STCHDR)
-$(OUTDIR)WinPrinterStream.$(O) WinPrinterStream.$(C) WinPrinterStream.$(H): WinPrinterStream.st $(STCHDR)
-$(OUTDIR)WinPrinterContext.$(O) WinPrinterContext.$(C) WinPrinterContext.$(H): WinPrinterContext.st $(STCHDR)
+$(OUTDIR)WinPrinterContext.$(O) WinPrinterContext.$(C) WinPrinterContext.$(H): WinPrinterContext.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview2\PrinterContext.$(H) $(STCHDR)
+$(OUTDIR)WinPrinterStream.$(O) WinPrinterStream.$(C) WinPrinterStream.$(H): WinPrinterStream.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic2\PrinterStream.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
diff -r 79f73b8182e2 -r 3a44cd850d0a libview2.rc
--- a/libview2.rc	Mon Apr 11 08:44:00 2016 +0100
+++ b/libview2.rc	Wed Apr 13 09:21:22 2016 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.5.0\0"
-      VALUE "ProductDate", "Fri, 08 Apr 2016 11:25:33 GMT\0"
+      VALUE "ProductDate", "Mon, 11 Apr 2016 15:45:20 GMT\0"
     END
 
   END
diff -r 79f73b8182e2 -r 3a44cd850d0a stx_libview2.st
--- a/stx_libview2.st	Mon Apr 11 08:44:00 2016 +0100
+++ b/stx_libview2.st	Wed Apr 13 09:21:22 2016 +0100
@@ -120,7 +120,7 @@
 
 additionalDefinitions_bc_dot_mak
     ^ '
-#LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
+# LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
 LIBJPEG_DIR=$(TOP)\support\libjpeg-9
 
 !!if defined(USEMINGW32) || defined(USEMINGW64)