From c47985823dee16d463cda527fe46d173ea129d58 Mon Sep 17 00:00:00 2001 From: "Alexey Teplov (" Date: Wed, 3 Nov 2010 07:48:27 +0000 Subject: [PATCH] Screenshoot use new version checkbox. git-svn-id: svn://kolibrios.org@1685 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../libraries/box_lib/trunk/box_lib.mac | 11 +- .../trunk/doc/checkbox/info_checkbox.htm | 67 ++++++++++- programs/media/scrshoot/scrshoot.asm | 110 +++++++++--------- programs/media/scrshoot/scrshoot.mac | 46 ++++---- programs/media/scrshoot/srectwin.inc | 20 +++- 5 files changed, 169 insertions(+), 85 deletions(-) diff --git a/programs/develop/libraries/box_lib/trunk/box_lib.mac b/programs/develop/libraries/box_lib/trunk/box_lib.mac index 88f30abbb3..2aa706676e 100644 --- a/programs/develop/libraries/box_lib/trunk/box_lib.mac +++ b/programs/develop/libraries/box_lib/trunk/box_lib.mac @@ -189,7 +189,7 @@ macro init_checkboxes2 start,end mov ecx,((end-start)/ch_struc_size) @@: push ebp ;㪠⥫ checkbox - call [init_checkbox2] ; ஢ન 誨 checkbox' + call [init_checkbox] ; ஢ન 誨 checkbox' add ebp,ch_struc_size loop @b } @@ -201,7 +201,7 @@ macro checkboxes_mouse2 start,end mov ecx,((end-start)/ch_struc_size) @@: push ebp ;㪠⥫ checkbox - call [check_box_mouse2] ;ᮢ checkbox + call [check_box_mouse] ;ᮢ checkbox add ebp,ch_struc_size loop @b } @@ -213,7 +213,7 @@ macro checkboxes_draw2 start,end mov ecx,((end-start)/ch_struc_size) @@: push ebp ;㪠⥫ checkbox - call [check_box_draw2] ;ᮢ checkbox + call [check_box_draw] ;ᮢ checkbox add ebp,ch_struc_size loop @b } @@ -225,9 +225,10 @@ macro check_boxes_set_sys_color2 start,end,color_table mov esi,color_table @@: push dword [esi+32] ;梥 ⥪ ࠡ祩 - pop dword ch_text_color + or dword [esp],0x80000000 ;室 뢮 ASCIIZ ப + pop dword 2ch_text_color push dword [esi+36] ;梥 䨪 (ࠧ⥫ ..) - pop dword ch_border_color + pop dword 2ch_border_color add ebp,ch_struc_size loop @b } diff --git a/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm b/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm index 822c35719d..f5c4888adf 100644 --- a/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm +++ b/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm @@ -8,6 +8,16 @@

+

Version 2

+

2

+ +
+

Version 1