use WMRectangles.MakeRect instead of WMGraphics.MakeRectangle

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

source/DTPText.Mod

@@ -1673,7 +1673,7 @@ TYPE
 					FOR j := 0 TO nofHighlights - 1 DO
 						IF (p > highlights[j].a) & (p <= highlights[j].b) THEN
 							CASE highlights[j].kind OF
-								|HLOver: canvas.Fill(WMGraphics.MakeRectangle(x + sx, top, x + ENTIER(dx) + sx+1, top + ENTIER(l.height)), highlights[j].color, WMGraphics.ModeSrcOverDst)
+								|HLOver: canvas.Fill(WMRectangles.MakeRect(x + sx, top, x + ENTIER(dx) + sx+1, top + ENTIER(l.height)), highlights[j].color, WMGraphics.ModeSrcOverDst)
 								|HLUnder: canvas.Line(x + sx, top + ENTIER(l.ascent), x + ENTIER(dx) + sx+1, top + ENTIER(l.ascent), highlights[j].color, WMGraphics.ModeSrcOverDst);
 								|HLWave: FOR k := 0 TO ENTIER (dx) - 1 DO
 									canvas.SetPixel(x + k + sx, top + ENTIER(l.ascent) + (1 - ABS((x + k) MOD 4 - 2)), highlights[j].color, WMGraphics.ModeSrcOverDst);

source/ModuleTrees.Mod

@@ -1,7 +1,7 @@
 MODULE ModuleTrees; (** AUTHOR "?"; PURPOSE "Visualize module structure as tree"; *)
 
 IMPORT
-	Streams, Commands, Diagnostics, WMStandardComponents, WMGraphics, WMProperties, WMComponents,
+	Streams, Commands, Diagnostics, WMStandardComponents, WMRectangles, WMGraphics, WMProperties, WMComponents,
 	WMTextView, WMEditors, Strings, Texts, TextUtilities, KernelLog,
 	WMTrees, WMEvents,
 	FoxScanner, ModuleParser;
@@ -486,9 +486,9 @@ TYPE
 			caption := tree.GetNodeCaption(node);
 			f.GetStringSize(caption^, tdx, tdy);
 			IF WMTrees.StateSelected IN state THEN
-				canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
+				canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
 			ELSIF WMTrees.StateHover IN state THEN
-				canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
+				canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
 			END;
 			IF caption # NIL THEN canvas.DrawString(dx, h - f.descent - 1 , caption^) END;
 		END DrawNode;

source/PETTrees.Mod

@@ -2,7 +2,7 @@ MODULE PETTrees; (** AUTHOR "?/staubesv"; PURPOSE "Interface for PET sidepanel t
 
 IMPORT
 	KernelLog,
-	Streams, Diagnostics, Strings, Texts, WMStandardComponents, WMGraphics, WMComponents,
+	Streams, Diagnostics, Strings, Texts, WMStandardComponents, WMRectangles, WMGraphics, WMComponents,
 	WMTextView, WMEditors, WMTrees, WMEvents;
 
 CONST
@@ -419,9 +419,9 @@ TYPE
 			caption := tree.GetNodeCaption(node);
 			f.GetStringSize(caption^, tdx, tdy);
 			IF WMTrees.StateSelected IN state THEN
-				canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
+				canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
 			ELSIF WMTrees.StateHover IN state THEN
-				canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
+				canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
 			END;
 			IF caption # NIL THEN canvas.DrawString(dx, h - f.descent - 1 , caption^) END;
 		END DrawNode;

source/Presentation.Mod

@@ -1,6 +1,6 @@
 MODULE Presentation; (** AUTHOR "TF"; PURPOSE "Dia-Show"; *)
 
-IMPORT Streams, Commands, KernelLog, WM := WMWindowManager, Graphics := WMGraphics, Files, Raster, WMTransitions,
+IMPORT Streams, Commands, KernelLog, WM := WMWindowManager, WMRectangles, Graphics := WMGraphics, Files, Raster, WMTransitions,
 	Strings, WMDialogs;
 
 TYPE
@@ -60,7 +60,7 @@ TYPE
 						IF current.prev # head THEN
 							transition.CalcImage(current.prev.img, current.img, fadeImage, i * 18);
 							canvas.DrawImage(0, 0, fadeImage, Graphics.ModeCopy);
-							Invalidate(Graphics.MakeRectangle(0, 0, img.width, img.height))
+							Invalidate(WMRectangles.MakeRect(0, 0, img.width, img.height))
 						END;
 					END;
 				END;
@@ -69,7 +69,7 @@ TYPE
 					canvas.SetColor(Graphics.White);
 					canvas.DrawString(10, 750, current.text^);
 				END;
-				Invalidate(Graphics.MakeRectangle(0, 0, img.width, img.height))
+				Invalidate(WMRectangles.MakeRect(0, 0, img.width, img.height))
 			END;
 		END DrawImg;
 

source/WMArchives.Mod

@@ -468,7 +468,7 @@ TYPE
 			IF img # NIL THEN
 					IF img.width > 16 THEN width := 16 ELSE width := img.width END;
 				IF img.height > 16 THEN height := 16 ELSE height := img.height END;
-				canvas.ScaleImage(img, WMGraphics.MakeRectangle(0, 0, img.width, img.height), WMGraphics.MakeRectangle(0, 0, width, height), WMGraphics.ModeSrcOverDst, WMGraphics.ScaleBox);
+				canvas.ScaleImage(img, WMRectangles.MakeRect(0, 0, img.width, img.height), WMRectangles.MakeRect(0, 0, width, height), WMGraphics.ModeSrcOverDst, WMGraphics.ScaleBox);
 				dx := 21;
 			END;
 			canvas.SetFont(f);
@@ -477,8 +477,8 @@ TYPE
 			ELSE canvas.SetColor(treeView.clTextDefault.Get())
 			END;
 			f.GetStringSize(caption^, tdx, tdy);
-			IF WMTrees.StateSelected IN state THEN canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
-			ELSIF WMTrees.StateHover IN state THEN canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
+			IF WMTrees.StateSelected IN state THEN canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
+			ELSIF WMTrees.StateHover IN state THEN canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
 			END;
 
 			IF caption # NIL THEN canvas.DrawString(dx, h - f.descent -1, caption^) END;

source/WMBuilder.Mod

@@ -464,13 +464,13 @@ TYPE
 			f.GetStringSize(caption^, tdx, tdy);
 
 			IF (bgColor # 0) THEN
-				canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), bgColor, WMGraphics.ModeSrcOverDst)
+				canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), bgColor, WMGraphics.ModeSrcOverDst)
 			END;
 
 			IF WMTrees.StateSelected IN state THEN
-				canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
+				canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clSelected.Get(), WMGraphics.ModeSrcOverDst)
 			ELSIF WMTrees.StateHover IN state THEN
-				canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
+				canvas.Fill(WMRectangles.MakeRect(0, 0, dx + tdx, h), treeView.clHover.Get(), WMGraphics.ModeSrcOverDst)
 			END;
 			IF caption # NIL THEN canvas.DrawString(dx, h - f.descent - 1 , caption^); END;
 		END DrawNode;

source/WMBunny.Mod

@@ -24,7 +24,7 @@ TYPE
 
 		PROCEDURE &New*(movie : Raster.Image; frames, step : LONGINT);
 		BEGIN
-			bounds :=WMGraphics.MakeRectangle(0, 0, movie.width DIV frames, movie.height);
+			bounds := Rectangles.MakeRect(0, 0, movie.width DIV frames, movie.height);
 			useAlpha := TRUE;
 			isVisible := TRUE;
 			NEW(random);

source/WMDefaultWindows.Mod

@@ -494,7 +494,7 @@ TYPE
 			minimizeOffset := s.minimizeOffset;
 			manager.lock.AcquireWrite;
 			r := bounds;
-			bounds := Graphics.MakeRectangle(master.bounds.l - s.lw, master.bounds.t - s.th, master.bounds.r + s.rw, master.bounds.t);
+			bounds := WMRectangles.MakeRect(master.bounds.l - s.lw, master.bounds.t - s.th, master.bounds.r + s.rw, master.bounds.t);
 			WMRectangles.ExtendRect(r, bounds);
 			manager.lock.ReleaseWrite;
 			manager.AddDirty(r)
@@ -512,7 +512,7 @@ TYPE
 				GetActivePics(a, b, c);
 				RepeatMiddleVertical(canvas, GetWidth(), GetHeight(), w, h, q, a, b, c)
 			ELSE
-				canvas.Fill(Graphics.MakeRectangle(0, 0, w, h), color, Graphics.ModeSrcOverDst);
+				canvas.Fill(WMRectangles.MakeRect(0, 0, w, h), color, Graphics.ModeSrcOverDst);
 				WMGraphicUtilities.ExtRectGlassShade(canvas, WMRectangles.MakeRect(0, 0, w, h), {0, 2, 3}, sw, FALSE);
 			END
 		END Draw;
@@ -539,7 +539,7 @@ TYPE
 			picAb := s.lia; picBb := s.lib; picCb := s.lic;
 			manager.lock.AcquireWrite;
 			r :=bounds;
-			bounds := Graphics.MakeRectangle(master.bounds.l - s.lw, master.bounds.t, master.bounds.l, master.bounds.b);
+			bounds := WMRectangles.MakeRect(master.bounds.l - s.lw, master.bounds.t, master.bounds.l, master.bounds.b);
 			WMRectangles.ExtendRect(r, bounds);
 			manager.lock.ReleaseWrite;
 			manager.AddDirty(r)
@@ -557,7 +557,7 @@ TYPE
 				GetActivePics(a, b, c);
 				RepeatMiddleVertical(canvas, GetWidth(), GetHeight(), w, h, q, a, b, c)
 			ELSE
-				canvas.Fill(Graphics.MakeRectangle(0, 0, w, h), color, Graphics.ModeSrcOverDst);
+				canvas.Fill(WMRectangles.MakeRect(0, 0, w, h), color, Graphics.ModeSrcOverDst);
 				WMGraphicUtilities.ExtRectGlassShade(canvas, WMRectangles.MakeRect(0, 0, w, h), {0, 1, 2}, sw, FALSE);
 			END
 		END Draw;
@@ -584,7 +584,7 @@ TYPE
 			picAb := s.ria; picBb := s.rib; picCb := s.ric;
 			manager.lock.AcquireWrite;
 			r :=bounds;
-			bounds := Graphics.MakeRectangle(master.bounds.r, master.bounds.t, master.bounds.r + s.rw, master.bounds.b);
+			bounds := WMRectangles.MakeRect(master.bounds.r, master.bounds.t, master.bounds.r + s.rw, master.bounds.b);
 			WMRectangles.ExtendRect(r, bounds);
 			manager.lock.ReleaseWrite;
 			manager.AddDirty(r)
@@ -628,7 +628,7 @@ TYPE
 			picAb := s.bia; picBb := s.bib; picCb := s.bic;
 			manager.lock.AcquireWrite;
 			r := bounds;
-			bounds := Graphics.MakeRectangle(master.bounds.l - s.lw, master.bounds.b, master.bounds.r + s.rw, master.bounds.b + s.bh);
+			bounds := WMRectangles.MakeRect(master.bounds.l - s.lw, master.bounds.b, master.bounds.r + s.rw, master.bounds.b + s.bh);
 			WMRectangles.ExtendRect(r, bounds);
 			manager.lock.ReleaseWrite;
 			manager.AddDirty(r)

source/WMGraphicUtilities.Mod

@@ -207,14 +207,14 @@ BEGIN
 	RadiusError := 0;
 
 	WHILE ( X>= Y ) DO
-		c.Fill(WMGraphics.MakeRectangle(CX+X, CY+Y,CX+X+1,CY+Y+1),c.color,1);
-		c.Fill(WMGraphics.MakeRectangle(CX-X, CY+Y,CX-X+1, CY+Y+1),c.color,1);
-		c.Fill(WMGraphics.MakeRectangle(CX-X, CY-Y,CX-X+1, CY-Y+1),c.color,1);
-		c.Fill(WMGraphics.MakeRectangle(CX+X, CY-Y,CX+X+1, CY-Y+1),c.color,1);
-		c.Fill(WMGraphics.MakeRectangle(CX+Y, CY+X,CX+Y+1,CY+X+1),c.color,1);
-		c.Fill(WMGraphics.MakeRectangle(CX-Y, CY+X,CX-Y+1, CY+X+1),c.color,1);
-		c.Fill(WMGraphics.MakeRectangle(CX-Y, CY-X,CX-Y+1, CY-X+1),c.color,1);
-		c.Fill(WMGraphics.MakeRectangle(CX+Y, CY-X,CX+Y+1, CY-X+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX+X, CY+Y,CX+X+1,CY+Y+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX-X, CY+Y,CX-X+1, CY+Y+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX-X, CY-Y,CX-X+1, CY-Y+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX+X, CY-Y,CX+X+1, CY-Y+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX+Y, CY+X,CX+Y+1,CY+X+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX-Y, CY+X,CX-Y+1, CY+X+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX-Y, CY-X,CX-Y+1, CY-X+1),c.color,1);
+		c.Fill(WMRectangles.MakeRect(CX+Y, CY-X,CX+Y+1, CY-X+1),c.color,1);
 		INC(Y);
 		INC(RadiusError, YChange);
 		INC(YChange,2);
@@ -245,10 +245,10 @@ BEGIN
 	StoppingX := TwoBSquare*XRadius;
 	StoppingY := 0;
 	WHILE ( StoppingX>= StoppingY ) DO (* 1st set of points, y>1 *)
-		c.Fill(WMGraphics.MakeRectangle(CX+X, CY+Y-1,CX+X+1,CY+Y+1),c.color,1); (*point in quadrant 1*)
-		c.Fill(WMGraphics.MakeRectangle(CX-X, CY+Y-1,CX-X+1, CY+Y+1),c.color,1); (*point in quadrant 2*)
-		c.Fill(WMGraphics.MakeRectangle(CX-X, CY-Y-1,CX-X+1, CY-Y+1),c.color,1); (*point in quadrant 3*)
-		c.Fill(WMGraphics.MakeRectangle(CX+X, CY-Y-1,CX+X+1, CY-Y+1),c.color,1); (*point in quadrant 4*)
+		c.Fill(WMRectangles.MakeRect(CX+X, CY+Y-1,CX+X+1,CY+Y+1),c.color,1); (*point in quadrant 1*)
+		c.Fill(WMRectangles.MakeRect(CX-X, CY+Y-1,CX-X+1, CY+Y+1),c.color,1); (*point in quadrant 2*)
+		c.Fill(WMRectangles.MakeRect(CX-X, CY-Y-1,CX-X+1, CY-Y+1),c.color,1); (*point in quadrant 3*)
+		c.Fill(WMRectangles.MakeRect(CX+X, CY-Y-1,CX+X+1, CY-Y+1),c.color,1); (*point in quadrant 4*)
 		INC(Y);
 		INC(StoppingY, TwoASquare);
 		INC(EllipseError, YChange);
@@ -269,10 +269,10 @@ BEGIN
 	StoppingX := 0;
 	StoppingY := TwoASquare*YRadius;
 	WHILE ( StoppingX<= StoppingY ) DO  (*2nd set of points, y < 1*)
-		c.Fill(WMGraphics.MakeRectangle(CX+X, CY+Y,CX+X+1,CY+Y+1),c.color,1); (*point in quadrant 1*)
-		c.Fill(WMGraphics.MakeRectangle(CX-X, CY+Y,CX-X+1, CY+Y+1),c.color,1); (*point in quadrant 2*)
-		c.Fill(WMGraphics.MakeRectangle(CX-X, CY-Y,CX-X+1, CY-Y+1),c.color,1); (*point in quadrant 3*)
-		c.Fill(WMGraphics.MakeRectangle(CX+X, CY-Y,CX+X+1, CY-Y+1),c.color,1); (*point in quadrant 4*)
+		c.Fill(WMRectangles.MakeRect(CX+X, CY+Y,CX+X+1,CY+Y+1),c.color,1); (*point in quadrant 1*)
+		c.Fill(WMRectangles.MakeRect(CX-X, CY+Y,CX-X+1, CY+Y+1),c.color,1); (*point in quadrant 2*)
+		c.Fill(WMRectangles.MakeRect(CX-X, CY-Y,CX-X+1, CY-Y+1),c.color,1); (*point in quadrant 3*)
+		c.Fill(WMRectangles.MakeRect(CX+X, CY-Y,CX+X+1, CY-Y+1),c.color,1); (*point in quadrant 4*)
 		INC(X);
 		INC(StoppingX, TwoBSquare);
 		INC(EllipseError, XChange);

source/WMGraphics.Mod

@@ -437,7 +437,7 @@ TYPE
 		(** set a pixel within the current clipping rectangle *)
 		PROCEDURE SetPixel*(x, y : LONGINT; color : Color; mode : LONGINT);
 		BEGIN
-			Fill(MakeRectangle(x, y, x + 1, y + 1), color, mode)
+			Fill(Rectangles.MakeRect(x, y, x + 1, y + 1), color, mode)
 		END SetPixel;
 
 		(** fill a rectangle within the current clipping rectangle *)
@@ -508,7 +508,7 @@ TYPE
 		PROCEDURE &New*(img : Raster.Image);
 		BEGIN
 			SELF.img := img;				
-			bounds := MakeRectangle(0, 0, img.width, img.height);
+			bounds := Rectangles.MakeRect(0, 0, img.width, img.height);
 			SetLimits(bounds);
 			clipRect := bounds;
 			clipMode := { ClipRect };
@@ -673,7 +673,7 @@ TYPE
 		BEGIN
 			IF (img = NIL) OR (img.adr = NIL) THEN RETURN END;
 			dx := SELF.dx; dy := SELF.dy; (* avoid race below *)
-			imgBounds := MakeRectangle(0, 0, img.width, img.height);
+			imgBounds := Rectangles.MakeRect(0, 0, img.width, img.height);
 
 			(* to super coordinates *)
 			Rectangles.MoveRel(imgBounds, x + dx, y + dy);

source/WMSimpleGraphs.Mod

@@ -40,7 +40,7 @@ TYPE
 			END;
 			canvas:=canvasGen(img);
 			Update(width, height);
-			rect := WMGraphics.MakeRectangle(0,0,GetWidth(), GetHeight());
+			rect := WMRectangles.MakeRect(0,0,GetWidth(), GetHeight());
 			Invalidate(rect);
 		END Resized;
 		
@@ -90,7 +90,7 @@ TYPE
 		BEGIN
 			SELF.data:=data;
 			Update(GetWidth(), GetHeight());
-			Invalidate(WMGraphics.MakeRectangle(0,0,GetWidth(), GetHeight()));
+			Invalidate(WMRectangles.MakeRect(0,0,GetWidth(), GetHeight()));
 		END NewData;
 		
 		PROCEDURE Update(w,h: LONGINT);
@@ -126,7 +126,7 @@ TYPE
 			Init(width, height, TRUE );
 			offset:=0; gain:=255/max;
 			IF( width<10) OR (height<10) THEN 
-				bounds := WMGraphics.MakeRectangle(0, 0, 10*width, 10*height);(* grow small images *)
+				bounds := WMRectangles.MakeRect(0, 0, 10*width, 10*height);(* grow small images *)
 				Resized(GetWidth(), GetHeight());
 			END;
 			WM.GetDefaultManager().Add(PosX, PosY, SELF, {WM.FlagFrame,WM.FlagClose});
@@ -144,7 +144,7 @@ TYPE
 			IF max=0 THEN max:=1 END;
 			offset:=0; gain:=255/max;
 			Update(GetWidth(), GetHeight());
-			Invalidate(WMGraphics.MakeRectangle(0,0,GetWidth(), GetHeight()));
+			Invalidate(WMRectangles.MakeRect(0,0,GetWidth(), GetHeight()));
 		END NewData;
 
 		PROCEDURE Update(w,h: LONGINT);
@@ -198,7 +198,7 @@ TYPE
 			max:=MAX(1, MAX(data));
 			min:=MIN(0, MIN(data)); 
 			Update(GetWidth(), GetHeight());
-			Invalidate(WMGraphics.MakeRectangle(0,0,GetWidth(), GetHeight()));
+			Invalidate(WMRectangles.MakeRect(0,0,GetWidth(), GetHeight()));
 		END NewData;
 
 		PROCEDURE Update(w,h: LONGINT);
@@ -251,7 +251,7 @@ Graphs* = OBJECT (Window);
 			max:=MAX(1, MAX(data));
 			min:=MIN(0, MIN(data)); 
 			Update(GetWidth(), GetHeight());
-			Invalidate(WMGraphics.MakeRectangle(0,0,GetWidth(), GetHeight()));
+			Invalidate(WMRectangles.MakeRect(0,0,GetWidth(), GetHeight()));
 		END NewData;
 
 		PROCEDURE Update(w,h: LONGINT);		
@@ -308,7 +308,7 @@ GraphXY* = OBJECT (Window);
 			maxx:=MAX(0,MAX(data[0]));maxy:=MAX(0,MAX(data[1]));
 			minx:=MIN(0, MIN(data[0])); miny:=MIN(0, MIN(data[1])); 
 			Update(GetWidth(), GetHeight());
-			Invalidate(WMGraphics.MakeRectangle(0,0,GetWidth(), GetHeight()));
+			Invalidate(WMRectangles.MakeRect(0,0,GetWidth(), GetHeight()));
 		END NewData;
 
 		

source/WMTextView.Mod

@@ -2605,7 +2605,7 @@ TYPE
 				FOR j := 0 TO nofHighlights - 1 DO
 					IF (p >= highlights[j].a) & (p < highlights[j].b) THEN
 						CASE highlights[j].kind OF
-							|HLOver: canvas.Fill(WMGraphics.MakeRectangle(x + sx, top, x + dx + sx, top + (l.height)), highlights[j].color, WMGraphics.ModeSrcOverDst)
+							|HLOver: canvas.Fill(WMRectangles.MakeRect(x + sx, top, x + dx + sx, top + (l.height)), highlights[j].color, WMGraphics.ModeSrcOverDst)
 							|HLUnder: canvas.Line(x + sx, top + (l.ascent), x + dx + sx, top + (l.ascent), highlights[j].color, WMGraphics.ModeSrcOverDst);
 							|HLWave:
 								FOR k := 0 TO dx - 1 DO

source/WMTrees.Mod

@@ -512,8 +512,8 @@ TYPE
 			ELSE canvas.SetColor(clTextDefault.Get())
 			END;
 			f.GetStringSize(node.caption^, tdx, tdy);
-			IF StateSelected IN state THEN canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), clSelected.Get(), WMGraphics.ModeSrcOverDst)
-			ELSIF StateHover IN state THEN canvas.Fill(WMGraphics.MakeRectangle(0, 0, dx + tdx, h), clHover.Get(), WMGraphics.ModeSrcOverDst)
+			IF StateSelected IN state THEN canvas.Fill(Rect.MakeRect(0, 0, dx + tdx, h), clSelected.Get(), WMGraphics.ModeSrcOverDst)
+			ELSIF StateHover IN state THEN canvas.Fill(Rect.MakeRect(0, 0, dx + tdx, h), clHover.Get(), WMGraphics.ModeSrcOverDst)
 			END;
 			IF node.caption # NIL THEN canvas.DrawString(dx, h - f.descent -1, node.caption^) END;
 		END DrawNode;
@@ -599,7 +599,7 @@ TYPE
 			END;
 
 			IF drawNode # NIL THEN
-				canvas.SetClipRect(WMGraphics.MakeRectangle(x, y, bounds.GetWidth(), y + height));
+				canvas.SetClipRect(Rect.MakeRect(x, y, bounds.GetWidth(), y + height));
 				canvas.ClipRectAsNewLimits(x, y);
 				state := {};
 				IF node = selectedNode THEN INCL(state, StateSelected) END;

source/WMWindowManager.Mod

@@ -205,7 +205,7 @@ TYPE
 		BEGIN
 			id := GetId();
 			timestamp := 0;
-			bounds := Graphics.MakeRectangle(0, 0, w, h);
+			bounds := Rectangles.MakeRect(0, 0, w, h);
 			initialBounds := bounds;
 			normalBounds := bounds;
 			manager := NIL; sequencer := NIL;

source/WindowManager.Mod

@@ -1338,23 +1338,23 @@ TYPE
 			top.useBitmaps := FALSE; left.useBitmaps := FALSE;
 			right.useBitmaps := FALSE; bottom.useBitmaps := FALSE;
 			(* Top *)
-			top.bounds := Graphics.MakeRectangle(l - lw, t - th, r + rw, t);
+			top.bounds := Rect.MakeRect(l - lw, t - th, r + rw, t);
 			top.mode := 0; top.distXY := XYResizeHandleSize;
 			top.SetPointerInfo(pointerMove); top.vertical := FALSE;
 			top.threshold := 110; top.focusthreshold := 200;
 
 			(* Left *)
-			left.bounds := Graphics.MakeRectangle(l - lw, t, l, b);
+			left.bounds := Rect.MakeRect(l - lw, t, l, b);
 			left.mode := 3; left.distXY := XYResizeHandleSize; left.vertical := TRUE;
 			left.threshold := 110; left.focusthreshold := 200;
 
 			(* Right *)
-			right.bounds := Graphics.MakeRectangle(r + 1, t, r + 1 + rw, b);
+			right.bounds := Rect.MakeRect(r + 1, t, r + 1 + rw, b);
 			right.mode := 1; right.distXY := XYResizeHandleSize; right.vertical := TRUE;
 			right.threshold := 110; right.focusthreshold := 200;
 
 			(* Bottom *)
-			bottom.bounds := Graphics.MakeRectangle(l - lw, b + 1, r + rw, b + 1 + bh);
+			bottom.bounds := Rect.MakeRect(l - lw, b + 1, r + rw, b + 1 + bh);
 			bottom.mode := 2; bottom.distXY :=   lw + XYResizeHandleSize; bottom.vertical := FALSE;
 			bottom.threshold := 110; bottom.focusthreshold := 200;
 
@@ -1623,9 +1623,9 @@ BEGIN
 	FillSession(session, color, noPointer);
 
 	IF (view.width0 > 0) & (view.height0 > 0) THEN
-		r := Graphics.MakeRectangle(0, 0, view.width0, view.height0);
+		r := Rect.MakeRect(0, 0, view.width0, view.height0);
 	ELSE
-		r := Graphics.MakeRectangle(0, 0, 1600, 1200);
+		r := Rect.MakeRect(0, 0, 1600, 1200);
 	END;
 	session.AddDirty(r);
 	WM.registry.Add(session, res);