uses WMGraphics.Color instead of LONGINT

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8503 8c9fc860-2736-0410-a75d-ab315db34111

source/AMD64.WMTransitions.Mod

@@ -711,7 +711,7 @@ VAR
 	mode : Raster.Mode;
 	canvas : WMGraphics.BufferCanvas;
 	pix : Raster.Pixel; (* pixel read from a or b *)
-	ca, cb : LONGINT; (* color of pixel in a and b *)
+	ca, cb : WMGraphics.Color; (* color of pixel in a and b *)
 	red, green, blue, alpha : LONGINT;
 BEGIN
 	IF (DEBUG) THEN

source/CyberbitNetInstall.Mod

@@ -196,7 +196,7 @@ TYPE
 	BevelPanel* = OBJECT(WMStandardComponents.Panel);
 	VAR
 		bevelWidth* : LONGINT;
-		bevelColor* : LONGINT;
+		bevelColor* : WMGraphics.Color;
 
 		PROCEDURE DrawBackground*(canvas : WMGraphics.Canvas);
 		BEGIN

source/DTPEditor.Mod

@@ -132,7 +132,7 @@ TYPE
 			label : WMStandardComponents.Label;
 			manager : WMWindowManager.WindowManager;
 			windowStyle : WMWindowManager.WindowStyle;
-			panelColor : LONGINT;
+			panelColor : WMGraphics.Color;
 
 		BEGIN
 			manager := WMWindowManager.GetDefaultManager();
@@ -1907,7 +1907,7 @@ TYPE
 			labelPanel, editorsPanel : WMStandardComponents.Panel;
 		 	dh, dw, dmt, dmb, dml, dmr, dfp : WMStandardComponents.Label;
 			windowStyle : WMWindowManager.WindowStyle;
-			panelColor : LONGINT;
+			panelColor : WMGraphics.Color;
 		BEGIN
 			windowStyle := manager.GetStyle();
 			panelColor := windowStyle.bgColor;

source/DTPImage.Mod

@@ -161,7 +161,7 @@ TYPE
 		VAR panel: WMStandardComponents.Panel;
 			label: WMStandardComponents.Label;
 			windowStyle : WMWindowManager.WindowStyle;
-			panelColor : LONGINT;
+			panelColor : WMGraphics.Color;
 		BEGIN
 			windowStyle := manager.GetStyle();
 			panelColor := windowStyle.bgColor;

source/DTPRect.Mod

@@ -26,7 +26,7 @@ TYPE
 
 	RectObject* = OBJECT(DTPData.ContentObject);
 	VAR
-		lineColor, rectColor, rectColor2: LONGINT;
+		lineColor, rectColor, rectColor2: WMGraphics.Color;
 		lineWidth : REAL;
 		fillMode : LONGINT;
 		gradientHorizontal: BOOLEAN;
@@ -199,7 +199,7 @@ TYPE
 			colorString: ARRAY 16 OF CHAR;
 			button: WMStandardComponents.Button;
 			windowStyle : WMWindowManager.WindowStyle;
-			panelColor : LONGINT;
+			panelColor : WMGraphics.Color;
 		BEGIN
 			windowStyle := manager.GetStyle();
 			panelColor := windowStyle.bgColor;
@@ -303,7 +303,7 @@ TYPE
 		PROCEDURE LineColorHandler(x, y : LONGINT; keys : SET; VAR handled : BOOLEAN);
 		VAR colorChooser: DTPUtilities.ColorChooserWindow;
 			rectangle: WMRectangles.Rectangle;
-			result: LONGINT;
+			result: WMGraphics.Color;
 			replaceColor: BOOLEAN;
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -322,7 +322,7 @@ TYPE
 		PROCEDURE RectColorHandler(x, y : LONGINT; keys : SET; VAR handled : BOOLEAN);
 		VAR colorChooser: DTPUtilities.ColorChooserWindow;
 			rectangle: WMRectangles.Rectangle;
-			result: LONGINT;
+			result: WMGraphics.Color;
 			replaceColor: BOOLEAN;
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -341,7 +341,7 @@ TYPE
 		PROCEDURE RectColor2Handler(x, y : LONGINT; keys : SET; VAR handled : BOOLEAN);
 		VAR colorChooser: DTPUtilities.ColorChooserWindow;
 			rectangle: WMRectangles.Rectangle;
-			result: LONGINT;
+			result: WMGraphics.Color;
 			replaceColor: BOOLEAN;
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN

source/DTPText.Mod

@@ -2854,7 +2854,7 @@ TYPE
 			resizerV: WMStandardComponents.Resizer;
 			label: WMStandardComponents.Label;
 			windowStyle : WMWindowManager.WindowStyle;
-			labelWidth, panelColor : LONGINT;
+			labelWidth: LONGINT; panelColor : WMGraphics.Color;
 		BEGIN
 			labelWidth := 90;
 			windowStyle := manager.GetStyle();

source/DTPUtilities.Mod

@@ -96,7 +96,7 @@ TYPE
 		label : WMStandardComponents.Label;
 		panel : WMStandardComponents.Panel;
 		button : WMStandardComponents.Button;
-		result: WORD; chosenColor* : LONGINT;
+		result: WORD; chosenColor* : WMGraphics.Color;
 		shown : BOOLEAN;
 
 		PROCEDURE CreateForm() : WMComponents.VisualComponent;
@@ -117,7 +117,7 @@ TYPE
 			(* SetTitle(Strings.NewString("Color Chooser")); *)
 		END New;
 
-		PROCEDURE Show*(x, y: LONGINT; VAR chosen: LONGINT):BOOLEAN;
+		PROCEDURE Show*(x, y: LONGINT; VAR chosen: WMGraphics.Color):BOOLEAN;
 		BEGIN
 			IF ~shown THEN
 				result := -1; shown := TRUE;
@@ -188,7 +188,7 @@ TYPE
 		END SetCaller;
 
 		PROCEDURE PointerDown*(x, y : LONGINT; keys : SET);
-		VAR r, g, b, a, i, j, cColor: LONGINT;
+		VAR r, g, b, a, i, j: LONGINT; cColor: WMGraphics.Color;
 		BEGIN
 			i := y DIV 10; j := x DIV 10;
 			IF (i>= 0) & (i<=2) THEN
@@ -219,7 +219,7 @@ TYPE
 		END FocusLost;
 *)
 		PROCEDURE Draw*(canvas: WMGraphics.Canvas);
-		VAR r, g, b, a, i, j, color: LONGINT;
+		VAR r, g, b, a, i, j: LONGINT; color: WMGraphics.Color;
 		BEGIN
 			Draw^(canvas);
 
@@ -320,7 +320,7 @@ TYPE
 			lineP: LinePanel;
 			manager : WMWindowManager.WindowManager;
 			windowStyle : WMWindowManager.WindowStyle;
-			panelColor : LONGINT;
+			panelColor : WMGraphics.Color;
 
 		BEGIN
 			labelWidth := 130;
@@ -1531,7 +1531,7 @@ TYPE
 
 		PROCEDURE ColorHandler(x, y : LONGINT; keys : SET; VAR handled : BOOLEAN);
 		VAR colorChooser: ColorChooserWindow;
-			result: LONGINT;
+			result: WMGraphics.Color;
 			replaceColor: BOOLEAN;
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -1548,7 +1548,7 @@ TYPE
 
 		PROCEDURE BGColorHandler(x, y : LONGINT; keys : SET; VAR handled : BOOLEAN);
 		VAR colorChooser: ColorChooserWindow;
-			result: LONGINT;
+			result: WMGraphics.Color;
 			replaceColor: BOOLEAN;
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -1722,8 +1722,8 @@ TYPE
 	END Checkbox;
 
 	PreviewPanel* = OBJECT(WMStandardComponents.Label)
-	VAR fontColor*: LONGINT;
-		fontBackColor*: LONGINT;
+	VAR fontColor*: WMGraphics.Color;
+		fontBackColor*: WMGraphics.Color;
 		oldFont : WMGraphics.Font;
 
 		PROCEDURE &Init*;
@@ -1931,19 +1931,19 @@ TYPE
 		spacerLeft, spacerTop, spacerRight, spacerBottom : WMStandardComponents.Panel;
 
 		caption* : ARRAY 128 OF CHAR;
-		textColor* : LONGINT;
+		textColor* : WMGraphics.Color;
 		font*: WMGraphics.Font;
 		alignH*, alignV* : LONGINT;			(*	0:	AlignLeft/AlignTop				*)
 											(*	1:	AlignCenter						*)
 		 									(*	2:	AlignRight/Bottom				*)
 		hasBevel* : BOOLEAN;
 		bevelWidth* : LONGINT;
-		bevelColor* : LONGINT;
+		bevelColor* : WMGraphics.Color;
 		bevelDown* : BOOLEAN;
 
 		hasInnerBevel* : BOOLEAN;
 		innerBevelWidth* : LONGINT;
-		innerBevelColor* : LONGINT;
+		innerBevelColor* : WMGraphics.Color;
 		innerBevelDown* : BOOLEAN;
 
 		hasGlass* : BOOLEAN;
@@ -1953,7 +1953,7 @@ TYPE
 
 		img* : Raster.Image;
 		imgBorderWidth* : LONGINT;
-		altFillColor* : LONGINT;
+		altFillColor* : WMGraphics.Color;
 		fillMode* : LONGINT;				(*	0:	Solid							*)
 											(*	1:	Gradient Horizontal				*)
 											(*	2:	Gradient Vertical				*)
@@ -2017,7 +2017,7 @@ TYPE
 
 		PROCEDURE Draw*(canvas: WMGraphics.Canvas);
 		VAR rect, rect1, rect2: WMRectangles.Rectangle;
-			color, mode: LONGINT;
+			color: WMGraphics.Color; mode: LONGINT;
 		BEGIN
 			(* DrawBackground(canvas); *)
 			rect := GetClientRect(); color := fillColor.Get(); mode := WMGraphics.ModeSrcOverDst;

source/DTPView.Mod

@@ -1955,7 +1955,7 @@ TYPE
 		VAR panel: WMStandardComponents.Panel;
 			label: WMStandardComponents.Label;
 			windowStyle : WMWindowManager.WindowStyle;
-			panelColor : LONGINT;
+			panelColor : WMGraphics.Color;
 		BEGIN
 			windowStyle := manager.GetStyle();
 			panelColor := windowStyle.bgColor;

source/I386.WMTransitions.Mod

@@ -709,7 +709,7 @@ VAR
 	mode : Raster.Mode;
 	canvas : WMGraphics.BufferCanvas;
 	pix : Raster.Pixel; (* pixel read from a or b *)
-	ca, cb : LONGINT; (* color of pixel in a and b *)
+	ca, cb : WMGraphics.Color; (* color of pixel in a and b *)
 	red, green, blue, alpha : LONGINT;
 BEGIN
 	IF (DEBUG) THEN

source/PDF.Mod

@@ -663,7 +663,7 @@ TYPE
 		font : Font;
 		next : PDFCanvas;
 		prl, prt, prr, prb, scale : REAL;
-		colrg, colRG: LONGINT;
+		colrg, colRG: WMGraphics.Color;
 		fSize : REAL;
 		xfont : Font;
 
@@ -704,7 +704,7 @@ TYPE
 			WriteReal(w, rx); w.Char(" "); WriteReal(w, ry)
 		END WriteTrafoCoord;
 
-		PROCEDURE SetColor*(col : LONGINT);
+		PROCEDURE SetColor*(col : WMGraphics.Color);
 		BEGIN
 			IF col # color THEN
 				SetColor^(col);
@@ -712,7 +712,7 @@ TYPE
 			END
 		END SetColor;
 
-		PROCEDURE SetColrg(col : LONGINT);
+		PROCEDURE SetColrg(col : WMGraphics.Color);
 		BEGIN
 			IF col # colrg THEN
 				WriteReal(w, ((col DIV 1000000H) MOD 100H)/ 255);w.Char(" ");
@@ -722,7 +722,7 @@ TYPE
 			END
 		END SetColrg;
 
-		PROCEDURE SetColRG(col : LONGINT);
+		PROCEDURE SetColRG(col : WMGraphics.Color);
 		BEGIN
 			IF col # colRG THEN
 				WriteReal(w, ((col DIV 1000000H) MOD 100H)/ 255);w.Char(" ");
@@ -732,7 +732,7 @@ TYPE
 			END
 		END SetColRG;
 
-		PROCEDURE Fill*(r : WMRectangles.Rectangle; col : LONGINT; mode : LONGINT);
+		PROCEDURE Fill*(r : WMRectangles.Rectangle; col : WMGraphics.Color; mode : LONGINT);
 		VAR ax, ay, bx ,by : REAL;
 		BEGIN
 			SetColrg(col);
@@ -982,7 +982,7 @@ TYPE
 			w.String("f*"); w.Ln
 		END FillPoly;
 
-		PROCEDURE Line*(x0, y0, x1, y1 : LONGINT; color : LONGINT; mode : LONGINT);
+		PROCEDURE Line*(x0, y0, x1, y1 : LONGINT; color : WMGraphics.Color; mode : LONGINT);
 		BEGIN
 			SetColRG(color);
 			WriteTrafoCoord(x0, y0); w.String(" m ");

source/Release.Mod

@@ -3346,11 +3346,11 @@ BEGIN
 									IF ~options.GetInteger("workers", nofWorkers) THEN nofWorkers := 0; END;
 									build.Compile(nofWorkers, context.out, context.error, options.GetFlag("verbose"), diagnostics, error);
 								ELSE
-									CallCommand("Notepad.Open", fullname, context);
+									CallCommand("PET.Open", fullname, context);
 								END;
 							ELSE
 								IF ~options.GetFlag("build") THEN
-									CallCommand("Notepad.Open", fullname, context);
+									CallCommand("PET.Open", fullname, context);
 								END;
 								context.out.String("error, res: "); context.out.Int(res, 0); context.out.Ln;
 								context.result := Commands.CommandError;
@@ -3461,7 +3461,7 @@ BEGIN
 									END;
 									build.Compile(nofWorkers, context.out, context.error, options.GetFlag("verbose"), diagnostics, error);
 								ELSIF ~options.GetFlag("zip") THEN
-									CallCommand("Notepad.Open", fullname, context);
+									CallCommand("PET.Open", fullname, context);
 								END;
 								IF ~error & options.GetFlag("zip") & CheckDiagnostics(diagnostics, options.GetFlag("warnings"), context.out) THEN
 									build.GenerateZipFiles(context.out, context.error, diagnostics, error);
@@ -3482,7 +3482,7 @@ BEGIN
 								END;
 							ELSE
 								IF ~options.GetFlag("build") THEN
-									CallCommand("Notepad.Open", fullname, context);
+									CallCommand("PET.Open", fullname, context);
 								END;
 								context.out.String("error, res: "); context.out.Int(res, 0); context.out.Ln;
 							END;

source/SSHClient.Mod

@@ -29,7 +29,7 @@ MODULE SSHClient; 	(** AUTHOR "G.F.";  PURPOSE "Secure Shell"; *)
 
 		Attribute = POINTER TO RECORD
 			fnt: WMG.Font;
-			bg, fg: LONGINT;
+			bg, fg: WMG.Color;
 			special: SET (* 0: underscore *)
 		END;
 
@@ -60,7 +60,7 @@ MODULE SSHClient; 	(** AUTHOR "G.F.";  PURPOSE "Secure Shell"; *)
 				mode: SET;
 				closeWindow: WindowCloser;
 
-				first, top: Line; bg: LONGINT;
+				first, top: Line; bg: WMG.Color;
 				scrollTop, scrollBottom: Line;
 				scrollBegin, scrollEnd: LONGINT;
 
@@ -424,7 +424,7 @@ Out.String("Dim"); Out.Ln()
 			END Dim;
 
 			PROCEDURE SetAttributes( CONST attrs: ARRAY OF LONGINT; n: LONGINT );
-			VAR c, i: LONGINT;
+			VAR c: WMG.Color; i: LONGINT;
 			BEGIN {EXCLUSIVE}
 				NewAttr();
 				i := 0;

source/SkinEditor.Mod

@@ -461,7 +461,7 @@ TYPE
 		END SearchHandler;
 
 		PROCEDURE DrawCell(canvas : WMGraphics.Canvas; w, h : LONGINT; state : SET; x, y : LONGINT);
-		VAR color : LONGINT; str : ARRAY 128 OF CHAR;
+		VAR color : WMGraphics.Color; str : ARRAY 128 OF CHAR;
 		BEGIN
 			color := WMGraphics.RGBAToColor(255, 255, 255, 255);
 			IF state * {WMGrids.CellFixed, WMGrids.CellSelected} = {WMGrids.CellFixed, WMGrids.CellSelected} THEN

source/TextUtilities.Mod

@@ -43,7 +43,7 @@ TYPE
 	VAR text : Texts.Text;
 		ucs32buf : POINTER TO ARRAY OF LONGINT;
 		fontName : ARRAY 32 OF CHAR;
-		fontSize, fontColor, fontBgColor, fontVOff : LONGINT;
+		fontSize, fontBgColor, fontVOff : LONGINT; fontColor: WMGraphics.Color;
 		fontStyle : SET;
 		currentAttributes- : Texts.Attributes;
 		oldBytes : ARRAY 7 OF CHAR;
@@ -157,7 +157,7 @@ TYPE
 			SetAttributes(NewAttributes());
 		END SetFontStyle;
 
-		PROCEDURE SetFontColor* (color : LONGINT);
+		PROCEDURE SetFontColor* (color : WMGraphics.Color);
 		BEGIN
 			fontColor := color;
 			SetAttributes(NewAttributes());

source/WMCalendar.Mod

@@ -264,7 +264,7 @@ TYPE
 			rect : WMRectangles.Rectangle;
 			dt : Dates.DateTime;
 			string : ARRAY 16 OF CHAR;
-			column, row, color, temp : LONGINT;
+			column, temp, row : LONGINT; color: WMGraphics.Color;
 
 			PROCEDURE DrawStringInRect(rect : WMRectangles.Rectangle; CONST string : ARRAY OF CHAR);
 			BEGIN
@@ -289,10 +289,10 @@ TYPE
 						color := clTextTitle.Get();
 					ELSE
 						IF (column = mouseOverColumn) & (row = mouseOverRow) & allowSelection.Get() THEN
-							temp := clMouseOver.Get();
-	 						canvas.Fill(rect, temp, WMGraphics.ModeSrcOverDst);
-	 						temp := temp - (temp MOD 100H) + 0FFH;
-	 						WMGraphicUtilities.DrawRect(canvas, rect, temp, WMGraphics.ModeCopy);
+							color := clMouseOver.Get();
+	 						canvas.Fill(rect, color, WMGraphics.ModeSrcOverDst);
+	 						color := color - (color MOD 100H) + 0FFH;
+	 						WMGraphicUtilities.DrawRect(canvas, rect, color, WMGraphics.ModeCopy);
 	 					END;
 						Strings.IntToStr(dt.day, string);
 						IF (dt.month = month.Get()) THEN

source/WMClock.Mod

@@ -313,7 +313,7 @@ TYPE
 
 		PROCEDURE DrawHands(canvas : WMGraphics.Canvas; time : Dates.DateTime);
 
-			PROCEDURE DrawLine(handLengthInPercent : LONGINT; color : LONGINT; angle : REAL);
+			PROCEDURE DrawLine(handLengthInPercent : LONGINT; color : WMGraphics.Color; angle : REAL);
 			VAR deltaX, deltaY : LONGINT; radiants : REAL; lengthX, lengthY : LONGINT;
 			BEGIN
 				lengthX := handLengthInPercent * bounds.GetWidth() DIV 2 DIV 100;

source/WMColorComponents.Mod

@@ -169,7 +169,7 @@ TYPE
 		END Init;
 
 		PROCEDURE SetColor*(sender, color : ANY);
-		VAR c : LONGINT;
+		VAR c : WMGraphics.Color;
 		BEGIN
 			IF color IS Color THEN
 				c := color(Color).value;

source/WMDiagramComponents.Mod

@@ -67,7 +67,7 @@ TYPE
 	DataDescriptor* = RECORD
 		name* : ARRAY 32 OF CHAR;
 		unit* : ARRAY 16 OF CHAR;
-		color* : LONGINT;
+		color* : WMGraphics.Color;
 		flags* : SET;
 	END;
 
@@ -745,7 +745,7 @@ TYPE
 		numberData-: LONGINT; (* number of box plot data *)
 		heights-: POINTER TO ARRAY OF LONGREAL; (* bin height *)
 		labels-: POINTER TO ARRAY OF Strings.String; (* bin label (if any) *)
-		colors- : POINTER TO ARRAY OF LONGINT;
+		colors- : POINTER TO ARRAY OF WMGraphics.Color;
 		c: CoordinateSystem;
 		vertical: BOOLEAN;
 
@@ -809,7 +809,7 @@ TYPE
 			Invalidate;
 		END SetLabels;
 
-		PROCEDURE SetColors*(CONST colors: ARRAY OF LONGINT);
+		PROCEDURE SetColors*(CONST colors: ARRAY OF WMGraphics.Color);
 		VAR i: LONGINT;
 		BEGIN
 			Acquire();

source/WMFontCCGConverter.Mod

@@ -97,7 +97,7 @@ TYPE
 		END PaintBoxPaint;
 
 		PROCEDURE DrawCell(canvas : WMGraphics.Canvas; w, h : LONGINT; state : SET; x, y : LONGINT);
-		VAR color : LONGINT; g : Glyph; ptr : ANY; str : ARRAY 32 OF CHAR;
+		VAR color : WMGraphics.Color; g : Glyph; ptr : ANY; str : ARRAY 32 OF CHAR;
 		BEGIN
 			color := WMGraphics.RGBAToColor(255, 255, 255, 255);
 			IF state * {WMGrids.CellFixed, WMGrids.CellSelected} = {WMGrids.CellFixed, WMGrids.CellSelected} THEN

source/WMGraphicsGfx.Mod

@@ -43,7 +43,7 @@ TYPE Canvas*= OBJECT(WMGraphics.BufferCanvas)
 		END SetLineWidth;
 		
 		(* set line color*)
-		PROCEDURE SetColor*(color:LONGINT);
+		PROCEDURE SetColor*(color:WMGraphics.Color);
 		BEGIN
 			IF color#SELF.color THEN
 				SetColor^(color);
@@ -72,7 +72,7 @@ TYPE Canvas*= OBJECT(WMGraphics.BufferCanvas)
 			END;	
 		END SetFillColor;
 		
-		PROCEDURE ColorToGfxColor(color:LONGINT):Gfx.Color;
+		PROCEDURE ColorToGfxColor(color:WMGraphics.Color):Gfx.Color;
 			VAR gfxcolor:Gfx.Color;
 		BEGIN
 			gfxcolor.a := INTEGER(color MOD 100H);

source/WMInspectionComponents.Mod

@@ -1165,7 +1165,7 @@ TYPE
 		END Apply;
 
 		PROCEDURE Synchronize(force : BOOLEAN);
-		VAR color : WMProperties.ColorProperty;  string : ARRAY 16 OF CHAR; value : LONGINT;
+		VAR color : WMProperties.ColorProperty;  string : ARRAY 16 OF CHAR; value : WMGraphics.Color;
 		BEGIN
 			Synchronize^(force);
 			color := SELF.color;

source/WMPerfMonComponents.Mod

@@ -730,7 +730,7 @@ TYPE
 		PROCEDURE InitView*;
 		VAR
 			labels : POINTER TO ARRAY OF Strings.String;
-			colors : POINTER TO ARRAY OF LONGINT;
+			colors : POINTER TO ARRAY OF WMGraphics.Color;
 			i : LONGINT;
 		BEGIN
 			ds := plugin.p.datasetDescriptor;

source/WMTaskScheduler.Mod

@@ -92,12 +92,12 @@ TYPE
 			END;
 	 	END UpdateTaskInfo;
 
-		PROCEDURE GetFillColor(secondsLeft : LONGINT) : LONGINT;
+		PROCEDURE GetFillColor(secondsLeft : LONGINT) : WMGraphics.Color;
 		BEGIN
 			RETURN WMGraphicUtilities.InterpolateColorLinear(LONGINT(0FFFF00C0H), LONGINT(0FF0000FFH), ENTIER(256 * ((3600 - secondsLeft) / 3600)));
 		END GetFillColor;
 
-		PROCEDURE GetIndicationColor() : LONGINT;
+		PROCEDURE GetIndicationColor() : WMGraphics.Color;
 		BEGIN
 			IF (indicationValue = 256) THEN
 				indicationStep := -256;
@@ -112,7 +112,7 @@ TYPE
 		VAR
 			trigger : Dates.DateTime;
 			newDateString : ARRAY 32 OF CHAR;
-			lastFillColor, newFillColor : LONGINT;
+			lastFillColor, newFillColor : WMGraphics.Color;
 			days, hours, minutes, seconds : LONGINT;
 		BEGIN
 			COPY(dateString, newDateString);

source/WMTextStyleTool.Mod

@@ -607,7 +607,7 @@ TYPE
 			handled := TRUE;
 		END ColorHandler;
 
-		PROCEDURE ColorPopupHandler(result: LONGINT);
+		PROCEDURE ColorPopupHandler(result: WMGraphics.Color);
 		VAR
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -625,7 +625,7 @@ TYPE
 			handled := TRUE;
 		END BGColorHandler;
 
-		PROCEDURE BGColorPopupHandler(result: LONGINT);
+		PROCEDURE BGColorPopupHandler(result: WMGraphics.Color);
 		VAR
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -1756,7 +1756,7 @@ TYPE
 			handled := TRUE;
 		END ColorHandler;
 
-		PROCEDURE ColorPopupHandler(result: LONGINT);
+		PROCEDURE ColorPopupHandler(result: WMGraphics.Color);
 		VAR
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -1776,7 +1776,7 @@ TYPE
 			handled := TRUE;
 		END BGColorHandler;
 
-		PROCEDURE BGColorPopupHandler(result: LONGINT);
+		PROCEDURE BGColorPopupHandler(result: WMGraphics.Color);
 		VAR
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN

source/WMTextTool.Mod

@@ -28,7 +28,7 @@ TYPE
 	ChangeInfo = OBJECT(Texts.Attributes);
 	VAR
 		name : ARRAY 128 OF CHAR; 	(* font name *)
-		fgColor, bgColor : LONGINT;		(* foreground and background color *)
+		fgColor, bgColor : WMGraphics.Color;		(* foreground and background color *)
 		deltaSize : LONGINT;			(* new font size, interpretation depends on deltaSizeMode field *)
 		deltaSizeMode : LONGINT;		(* Absolute, IncrementBy or DecrementBy *)
 		style : SET;						(* font style *)
@@ -386,7 +386,7 @@ TYPE
 			handled := TRUE;
 		END ColorHandler;
 
-		PROCEDURE ColorPopupHandler(result: LONGINT);
+		PROCEDURE ColorPopupHandler(result: WMGraphics.Color);
 		VAR
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN
@@ -405,7 +405,7 @@ TYPE
 			handled := TRUE;
 		END BGColorHandler;
 
-		PROCEDURE BGColorPopupHandler(result: LONGINT);
+		PROCEDURE BGColorPopupHandler(result: WMGraphics.Color);
 		VAR
 			colorString: ARRAY 16 OF CHAR;
 		BEGIN

source/WMVT100.Mod

@@ -199,7 +199,7 @@ MODULE WMVT100; (* ejz,  ph *)
 
 		Attribute = POINTER TO RECORD
 			fnt: WMGraphics.Font;
-			bg, fg: LONGINT;
+			bg, fg: WMGraphics.Color;
 			special: SET (* 0: underscore *)
 		END;
 
@@ -223,7 +223,7 @@ MODULE WMVT100; (* ejz,  ph *)
 		Frame = OBJECT (WMComponents.VisualComponent)
 			VAR
 				C: Connection;
-				first, last, top: Line; bg: LONGINT;
+				first, last, top: Line; bg: WMGraphics.Color;
 				rows, cols, boxW, boxH, dX, dY: LONGINT;
 				tabs: POINTER TO ARRAY OF BOOLEAN;
 				attr: Attribute; cursor: Position;
@@ -465,7 +465,7 @@ MODULE WMVT100; (* ejz,  ph *)
 			END Dim;
 
 			PROCEDURE SetAttributes(attrs: ARRAY OF LONGINT; n: LONGINT);
-				VAR c, i: LONGINT;
+				VAR c: WMGraphics.Color; i: LONGINT;
 			BEGIN {EXCLUSIVE}
 				NewAttr();
 				i := 0;
@@ -737,7 +737,7 @@ MODULE WMVT100; (* ejz,  ph *)
 			END CursorKey;
 
 			PROCEDURE KeyEvent*(ucs: LONGINT; flags: SET; VAR keySym: LONGINT);
-			VAR echo: ARRAY 1 OF LONGINT; col:LONGINT;
+			VAR echo: ARRAY 1 OF LONGINT; col: WMGraphics.Color;
 			BEGIN
 				IF ~(Inputs.Release IN flags) & hasFocus THEN
 					IF (keySym DIV 256) = 0 THEN