From 788e314354661b4740d5de6ba93673cd4a391185 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 19 Aug 2015 16:15:23 +0200
Subject: Fixed issue with Tut 8.5 (menus) where Drawable pointer wasn't passed
 around fully

---
 ospicture.icl      |  2 +-
 pictCCall_12.icl   | 42 +++++++++++++++++++++---------------------
 rgnCCall_12.icl    |  2 +-
 windowCCall_12.icl |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ospicture.icl b/ospicture.icl
index 3635805..f2ceb2a 100644
--- a/ospicture.icl
+++ b/ospicture.icl
@@ -640,7 +640,7 @@ getPictureScalingFactors :: !OSPictContext !*OSToolbox -> (!(!Int,!Int),!(!Int,!
 getPictureScalingFactors _ _
 	= code
 	{
-		ccall WinGetPictureScaleFactor "II-IIIIII"
+		ccall WinGetPictureScaleFactor "pI-IIIIpI"
 	}
 
 getpictpenattributes :: !*Picture -> (![PenAttribute],!*Picture)
diff --git a/pictCCall_12.icl b/pictCCall_12.icl
index 193664d..b03661b 100644
--- a/pictCCall_12.icl
+++ b/pictCCall_12.icl
@@ -484,7 +484,7 @@ winMoveRectangle _ _ _
 	= code
 	{
 		.inline WinMoveRectangle
-			ccall WinMoveRectangle "IIIIIIII-II"
+			ccall WinMoveRectangle "IIIIIIpI-pI"
 		.end
 	}
 
@@ -493,7 +493,7 @@ winMoveRectangleTo _ _ _
 	= code
 	{
 		.inline WinMoveRectangleTo
-			ccall WinMoveRectangleTo "IIIIIIII-II"
+			ccall WinMoveRectangleTo "IIIIIIpI-pI"
 		.end
 	}
 
@@ -503,7 +503,7 @@ winInvertRectangle _ _
 	= code
 	{
 		.inline WinInvertRectangle
-			ccall WinInvertRectangle "IIIIII-II"
+			ccall WinInvertRectangle "IIIIpI-pI"
 		.end
 	}
 
@@ -512,7 +512,7 @@ winEraseRectangle _ _
 	= code
 	{
 		.inline WinEraseRectangle
-			ccall WinEraseRectangle "IIIIII-II"
+			ccall WinEraseRectangle "IIIIpI-pI"
 		.end
 	}
 
@@ -521,7 +521,7 @@ winFillRectangle _ _
 	= code
 	{
 		.inline WinFillRectangle
-			ccall WinFillRectangle "IIIIII-II"
+			ccall WinFillRectangle "IIIIpI-pI"
 		.end
 	}
 
@@ -530,7 +530,7 @@ winDrawRectangle _ _
 	= code
 	{
 		.inline WinDrawRectangle
-			ccall WinDrawRectangle "IIIIII-II"
+			ccall WinDrawRectangle "IIIIpI-pI"
 		.end
 	}
 
@@ -540,7 +540,7 @@ winDrawChar _ _
 	= code
 	{
 		.inline WinDrawChar
-			ccall WinDrawChar "III-II"
+			ccall WinDrawChar "IpI-pI"
 		.end
 	}
 
@@ -549,7 +549,7 @@ winDrawString _ _
 	= code
 	{
 		.inline WinDrawString
-			ccall WinDrawString "SII-II"
+			ccall WinDrawString "SpI-pI"
 		.end
 	}
 
@@ -559,7 +559,7 @@ winDrawCCurve _ _ _ _ _
 	= code
 	{
 		.inline WinDrawCCurve
-			ccall WinDrawCCurve "IIIIIIIIIIIII-II"
+			ccall WinDrawCCurve "IIIIIIIIIIIpI-pI"
 		.end
 	}
 
@@ -568,7 +568,7 @@ winDrawCLine _ _ _ _
 	= code
 	{
 		.inline WinDrawCLine
-			ccall WinDrawCLine "IIIIIIIII-II"
+			ccall WinDrawCLine "IIIIIIIpI-pI"
 		.end
 	}
 
@@ -577,7 +577,7 @@ winDrawCPoint _ _ _
 	= code
 	{
 		.inline WinDrawCPoint
-			ccall WinDrawCPoint "IIIIIII-II"
+			ccall WinDrawCPoint "IIIIIpI-pI"
 		.end
 	}
 
@@ -586,7 +586,7 @@ winDrawCurve _ _ _ _
 	= code
 	{
 		.inline WinDrawCurve
-			ccall WinDrawCurve "IIIIIIIIII-II"
+			ccall WinDrawCurve "IIIIIIIIpI-pI"
 		.end
 	}
 
@@ -595,7 +595,7 @@ winDrawLine _ _ _
 	= code
 	{
 		.inline WinDrawLine
-			ccall WinDrawLine "IIIIII-II"
+			ccall WinDrawLine "IIIIpI-pI"
 		.end
 	}
 
@@ -650,7 +650,7 @@ winGetPenPos _
 	= code
 	{	
 		.inline WinGetPenPos
-			ccall WinGetPenPos "Ip-IIII"
+			ccall WinGetPenPos "pI-IIII"
 		.end
 	}
 
@@ -660,7 +660,7 @@ winSetPenSize _ _
 	= code
 	{
 		.inline WinSetPenSize
-			ccall WinSetPenSize "III-II"
+			ccall WinSetPenSize "IpI-pI"
 		.end
 	}
 
@@ -669,7 +669,7 @@ winSetPattern _ _
 	= code
 	{
 		.inline WinSetPattern
-			ccall WinSetPattern "III-II"
+			ccall WinSetPattern "IpI-pI"
 		.end
 	}
 
@@ -678,7 +678,7 @@ winSetMode _ _
 	= code
 	{
 		.inline WinSetMode
-			ccall WinSetMode "III-II"
+			ccall WinSetMode "IpI-pI"
 		.end
 	}
 
@@ -706,7 +706,7 @@ winClipPicture _ _
 	= code
 	{
 		.inline WinClipPicture
-			ccall WinClipPicture "IIIIII-II"
+			ccall WinClipPicture "IIIIpI-pI"
 		.end
 	}
 
@@ -726,7 +726,7 @@ winSetClipRgnPicture _ _
 	= code
 	{
 		.inline WinSetClipRgnPicture
-			ccall WinSetClipRgnPicture "III-II"
+			ccall WinSetClipRgnPicture "ppI-pI"
 		.end
 	}
 
@@ -754,7 +754,7 @@ winDonePicture _
     = code
     {
         .inline WinDonePicture
-            ccall WinDonePicture "pp-pp"
+            ccall WinDonePicture "pI-pI"
         .end
     }
 
@@ -763,6 +763,6 @@ winInitPicture _ _ _ _ _ _ _ _
 	= code
 	{
 		.inline WinInitPicture
-			ccall WinInitPicture "IIIIIIIIIISIIIIII-II"
+			ccall WinInitPicture "IIIIIIIIIISIIIIpI-pI"
 		.end
 	}
diff --git a/rgnCCall_12.icl b/rgnCCall_12.icl
index be72fe0..3c18d74 100644
--- a/rgnCCall_12.icl
+++ b/rgnCCall_12.icl
@@ -50,7 +50,7 @@ winCombineRgn _ _ _ _ _
 	= code
 	{	
 		.inline WinCombineRgn
-			ccall WinCombineRgn "IIIIp-pp"
+			ccall WinCombineRgn "pppIp-pp"
 		.end
 	}
 
diff --git a/windowCCall_12.icl b/windowCCall_12.icl
index e21a79e..501c9cd 100644
--- a/windowCCall_12.icl
+++ b/windowCCall_12.icl
@@ -58,7 +58,7 @@ winGetDC _ _
 	= code
 	{
 		.inline WinGetDC
-			ccall WinGetDC "II-II"
+			ccall WinGetDC "II-pI"
 		.end
 	}
 
-- 
cgit v1.2.3