From e1ff25c4c9ffa1e2eead7f06d5fe33e94b02ea67 Mon Sep 17 00:00:00 2001 From: "Alexey Teplov (" Date: Fri, 16 Oct 2009 02:01:53 +0000 Subject: [PATCH] some upgrade. It's work with last library box_lib.obj. git-svn-id: svn://kolibrios.org@1217 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../develop/libraries/box_lib/C--/trunk/EditBox2.c-- | 4 ++-- .../libraries/box_lib/C--/trunk/use_library.h-- | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/develop/libraries/box_lib/C--/trunk/EditBox2.c-- b/programs/develop/libraries/box_lib/C--/trunk/EditBox2.c-- index 11c09c6c77..0c2dedfaa5 100644 --- a/programs/develop/libraries/box_lib/C--/trunk/EditBox2.c-- +++ b/programs/develop/libraries/box_lib/C--/trunk/EditBox2.c-- @@ -11,8 +11,8 @@ //char edit_path[256] = "You can edit me!"; //содержимое EditBox'a char way_of_ini[250] = "/sys/lib/box_lib.obj",NULL; //содержимое EditBox'a - -edit_box edit1= {250,14,35,0xffffff,0x6f9480,0,0xAABBCC,0,248,#way_of_ini,2,20,20}; +dword mouse_dd; +edit_box edit1= {250,14,35,0xffffff,0x6f9480,0,0xAABBCC,0,248,#way_of_ini,#mouse_dd,2,20,20}; //ed_width equ [edi] ;ширина компонента //ed_left equ [edi+4] ;положение по оси х diff --git a/programs/develop/libraries/box_lib/C--/trunk/use_library.h-- b/programs/develop/libraries/box_lib/C--/trunk/use_library.h-- index 979668626a..c2048f9016 100644 --- a/programs/develop/libraries/box_lib/C--/trunk/use_library.h-- +++ b/programs/develop/libraries/box_lib/C--/trunk/use_library.h-- @@ -2,7 +2,7 @@ dword edit_box_draw = #aEdit_box_draw; dword edit_box_key = #aEdit_box_key; dword edit_box_mouse = #aEdit_box_mouse; -dword version_ed = #aVersion_ed; +//dword version_ed = #aVersion_ed; //dword //dword @@ -31,20 +31,19 @@ dword bm__ = 0x0; char aEdit_box_draw[9] = "edit_box\0"; char aEdit_box_key[13] = "edit_box_key\0"; char aEdit_box_mouse[15] = "edit_box_mouse\0"; -char aVersion_ed[11] = "version_ed\0"; +//char aVersion_ed[11] = "version_ed\0"; char aCheck_box_draw [15] = "check_box_draw\0"; char aCheck_box_mouse [16] = "check_box_mouse\0"; -char aVersion_ch [11] = "version_ch\0"; +//char aVersion_ch [11] = "version_ch\0"; char aOption_box_draw [16] = "option_box_draw\0"; char aOption_box_mouse[17] = "option_box_mouse\0"; -char aVersion_op [11] = "version_op\0" ; - +//char aVersion_op [11] = "version_op\0" ; struct edit_box{ dword width, left, top, color, shift_color, focus_border_color, blur_border_color, -text_color, max, text, flags, size, pos, offset, cl_curs_x, cl_curs_y, shift, shift_old; +text_color, max, text, mouse_variable, flags, size, pos, offset, cl_curs_x, cl_curs_y, shift, shift_old; }; //void Edit_box_draw(dword edit_b)