platform dependencies

Util/flexwin.dcl

@@ -7,7 +7,7 @@ class content_size c :: FontMetrics c -> Int
 ::FlexBarState s
 ::	FlexBarWindow s ls pst
 	= FlexBarWindow Title [(String, Maybe Int)] s
-		(!s .Int .Int [.Int] -> (.SelectState .UpdateState -> .(*Picture -> *Picture)))
+		(s .Int .Int [.Int] -> (.SelectState .UpdateState -> .(*Picture -> *Picture)))
 		![(FlexBarState s) -> FlexBarState s]
 		(R2Id (MessageIn s) (MessageOut s)) [WindowAttribute *(ls,pst)]
 

Util/flexwin.icl

@@ -13,6 +13,7 @@ o Sensible size handling
 import StdEnum, StdString, StdFunc, StdList, StdBool, StdTuple, StdMisc, StdArray
 import StdWindow, StdId, StdProcess, StdWindowAttribute, StdReceiver
 import StdPSt, StdPicture, StdControl, StdControlReceiver
+import Platform
 
 class content_size c :: FontMetrics c -> Int
 
@@ -57,16 +58,22 @@ mi2cw (Just w)
 		Title
 		[(String, Maybe Int)]
 		s
-		(!s .Int .Int [.Int] -> (.SelectState .UpdateState -> .(*Picture -> *Picture)))
+		(s .Int .Int [.Int] -> (.SelectState .UpdateState -> .(*Picture -> *Picture)))
 		![(FlexBarState s) -> FlexBarState s]
 		(R2Id (MessageIn s) (MessageOut s))
 		[WindowAttribute *(ls,pst)]
 
-flexFont =
+flexFont = PlatformDependant
+	// Win
 	{ fName		= "Courier New"
 	, fStyles	= []//[BoldStyle]
 	, fSize		= 9//8
 	}
+	// Mac
+	{ fName		= "Monaco"//"Courier"
+	, fStyles	= []//[BoldStyle]
+	, fSize		= 10//9
+	}
 
 instance Windows (FlexBarWindow s) | content_size s
 where