small 2.0 fixes

ObjectIO/ObjectIO/OS Windows/oswindow.icl

@@ -1201,6 +1201,7 @@ osInvalidateCompoundRect :: !OSWindowPtr !OSRect !*OSToolbox -> *OSToolbox
 osInvalidateCompoundRect compoundPtr rect tb
 	= winInvalidateRect compoundPtr (toTuple4 rect) tb
 */
+
 osSetCompoundSliderThumb :: !OSWindowMetrics !OSWindowPtr !OSWindowPtr !OSWindowPtr !OSRect !Bool !Int !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox
 osSetCompoundSliderThumb wMetrics _ compoundPtr _ _ isHorizontal thumb (maxx,maxy) redraw tb
 	= winSetScrollPos compoundPtr (if isHorizontal SB_HORZ SB_VERT) thumb maxx` maxy` extent tb

ObjectIO/ObjectIO/StdId.dcl

@@ -11,7 +11,10 @@ definition module StdId
 
 
 from	StdMaybe	import :: Maybe
-from	id			import :: Id, :: RId, :: R2Id, rIdtoId, r2IdtoId, class toString, class ==
+from	id			import :: Id, :: RId, :: R2Id, rIdtoId, r2IdtoId, class ==,
+							instance == Id, 
+							instance ==	(RId  mess), 
+							instance == (R2Id mess resp)
 from	iostate		import :: IOSt, :: PSt
 
 class Ids env where

ObjectIO/ObjectIO/StdPrint.dcl

@@ -9,12 +9,15 @@ definition module StdPrint
 //	********************************************************************************
  
 
+from	StdFile			import :: Files
 from	StdIOCommon		import :: UpdateState
 from	StdIOBasic		import :: IdFun, :: Size, :: Rectangle, :: Point2
 from	StdOverloaded	import class ==
 from	ospicture		import :: Picture
 from	osprint			import :: Alternative(..), class PrintEnvironments(..),
-							:: PrintInfo(..), :: PrintSetup, :: JobInfo(..)
+							:: PrintInfo(..), :: PrintSetup, :: JobInfo(..),
+							instance PrintEnvironments Files,
+							instance PrintEnvironments (PSt .l)
 from	iostate			import :: PSt
 from	StdFile			import class FileEnv
 

ObjectIO/ObjectIO/relayout.icl

@@ -145,19 +145,22 @@ where
 					| not hasScroll
 						= tb
 //					# tb			= osSetCompoundSliderThumbSize wMetrics compoundPtr isHorizontal size (rright,rbottom) (old==new) tb
-					# tb			= osSetCompoundSliderThumbSize wMetrics wPtr compoundPtr scrollPtr scrollMin scrollMax scrollSize scrollRect isHorizontal able (old==new) tb
+//					# tb			= osSetCompoundSliderThumbSize wMetrics wPtr compoundPtr scrollPtr scrollMin scrollMax scrollSize scrollRect isHorizontal able (old==new) tb
+					# tb			= osSetCompoundSliderThumbSize wMetrics wPtr compoundPtr scrollPtr min max wid scrollRect isHorizontal able (old==new) tb
 					| old==new
 						# tb		= osUpdateCompoundScroll wPtr scrollPtr scrollRect tb
 						= tb
 //					| otherwise		= osSetCompoundSliderThumb wMetrics compoundPtr isHorizontal new (rright,rbottom) True tb
 					| otherwise
-						# tb		= osSetCompoundSliderThumb wMetrics wPtr compoundPtr scrollPtr scrollRect isHorizontal new (rright,rbottom) True tb
+//						# tb		= osSetCompoundSliderThumb wMetrics wPtr compoundPtr scrollPtr scrollRect isHorizontal new (rright,rbottom) True tb
+						# tb		= osSetCompoundSliderThumb wMetrics wPtr compoundPtr scrollPtr scrollRect isHorizontal pos (rright,rbottom) True tb
 						# tb		= osUpdateCompoundScroll wPtr scrollPtr scrollRect tb
 						= tb
 				where
+					(min,pos,max,wid)	= toOSscrollbarRange (scrollMin,new,scrollMax) size
 					scrollPtr		= if isHorizontal (fromJust hScrollPtr) (fromJust vScrollPtr)
 					scrollMin		= if isHorizontal (newDomainRect.rleft) (newDomainRect.rtop)
-					scrollMax		= if isHorizontal (newDomainRect.rright-newContentSize.w) (newDomainRect.rbottom-newContentSize.h)
+					scrollMax		= if isHorizontal (newDomainRect.rright/*-newContentSize.w*/) (newDomainRect.rbottom/*-newContentSize.h*/)
 					scrollRect		= if isHorizontal hRect` vRect`
 					scrollSize		= if isHorizontal newContentSize.w newContentSize.h
 			relayout wPtr wMetrics newArea IsLayoutControl (oldFrame,oldParentPos,old) (newFrame,newParentPos,new) rgnHs picture

ObjectIO/ObjectIO/timertable.icl

 implementation module timertable
 
 
-import StdInt, StdBool, StdClass, StdList, StdMaybe, StdMisc
+import StdInt, StdBool, StdClass, StdList, StdMaybe, StdMisc, StdId
 import commondef, systemid, device
 import StdTimerDef