calc: a bit more flexible GUI

git-svn-id: svn://kolibrios.org@6215 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/system/end/light/end.asm

@@ -22,22 +22,10 @@ include '../../../proc32.inc'
 include '../../../dll.inc'
 include '../../../develop/libraries/box_lib/load_lib.mac'
 include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../../gui_patterns.inc'
 
 @use_library
 
-macro DrawBar  x, y, width, height, color 
-{
-	mcall 13, (x) shl 16 + (width), (y) shl 16 + (height), color
-}
-
-macro DrawRectangle  x, y, w, h, color 
-{
-	DrawBar x,y,w,1,color
-	DrawBar x,y+h,w,1
-	DrawBar x,y,1,h
-	DrawBar x+w,y,1,h+1
-}
-
 	
 align 4
 START: