From 71ed2cda32a618611407f6a0e41374fdbf4c47a9 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 3 Apr 2012 10:41:15 +0000
Subject: [PATCH] zkey 0.51: window caption updated

git-svn-id: svn://kolibrios.org@2549 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/system/zkey/trunk/ASPAPI.INC | 18 +++++-------------
 programs/system/zkey/trunk/ZKEY.ASM   |  7 +++----
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/programs/system/zkey/trunk/ASPAPI.INC b/programs/system/zkey/trunk/ASPAPI.INC
index 99c818f354..83b0a30e17 100644
--- a/programs/system/zkey/trunk/ASPAPI.INC
+++ b/programs/system/zkey/trunk/ASPAPI.INC
@@ -1,25 +1,17 @@
 include 'proc32.inc'
 
-macro start_draw_window x,y,xsize,ysize,areacolor,caption,capsize
+macro start_draw_window x,y,xsize,ysize,areacolor,caption
 {
 	;pusha
 	mov	eax, 12 		; function 12:tell os about windowdraw
 	mov	ebx, 1			; 1, start of draw
 	int	0x40
 	; DRAW WINDOW
-	mov	eax, 0			; function 0 : define and draw window
-	mov	ebx, x*65536+xsize	; [x start] *65536 + [x size]
-	mov	ecx, y*65536+ysize	; [y start] *65536 + [y size]
+	mov	eax, 0			     ; function 0 : define and draw window
+	mov	ebx, x*65536+xsize	 ; [x start] *65536 + [x size]
+	mov	ecx, y*65536+ysize	 ; [y start] *65536 + [y size]
 	mov	edx, areacolor		 ; color of work area RRGGBB
-	mov	esi, 0x00334455 	 ; color of grab bar  RRGGBB
-	mov	edi, 0x00ddeeff 	 ; color of frames    RRGGBB
-	int	0x40
-	; WINDOW LABEL
-	mov	eax, 4			; function 4 : write text to window
-	mov	ebx, 8*65536+8		; [x start] *65536 + [y start]
-	mov	ecx, 0x00ffffff 	; color of text RRGGBB
-	mov	edx, caption		; pointer to text beginning
-	mov	esi, capsize	; text length
+	mov	edi, caption         ; color of frames    RRGGBB
 	int	0x40
 	;popa
 }
diff --git a/programs/system/zkey/trunk/ZKEY.ASM b/programs/system/zkey/trunk/ZKEY.ASM
index 123ef837de..12ac649f5c 100644
--- a/programs/system/zkey/trunk/ZKEY.ASM
+++ b/programs/system/zkey/trunk/ZKEY.ASM
@@ -1,5 +1,5 @@
 ;
-;   ZKEY. Version 0.5.
+;   ZKEY. Version 0.51.
 ;   Virtual keyboard for KolibriOS.
 ;
 ;   Author:         Asper
@@ -39,7 +39,7 @@ draw_window:
   jnz	 @f
   test	 byte [red_type], 2
   jnz	 .draw_switch_button
-  start_draw_window 100,370,600,210,0x04224466,labelt, 35;labellen-labelt
+  start_draw_window 100,370,600,210,0x14224466,labelt
 
   stdcall draw_button, 15,50,23,20,2,N_KEYCOLOR,keyText,3,TEXTCOLOR		; Esc
 
@@ -406,8 +406,7 @@ ret
 ; DATA AREA
 
 ; Application Title
-labelt		db	'ZKEY v.0.5 - keyboard for KolibriOS'
-labellen:
+labelt db 'ZKEY v0.51 - keyboard for KolibriOS', 0
 
 SwitchText db ' ASCII SCAN '