diff --git a/programs/develop/fasm/trunk/fasm.asm b/programs/develop/fasm/trunk/fasm.asm index 6c5915c408..63cb56a12d 100644 --- a/programs/develop/fasm/trunk/fasm.asm +++ b/programs/develop/fasm/trunk/fasm.asm @@ -334,21 +334,9 @@ fun_opn_dlg: ; mov [edit3.size],edi mov [edit3.pos],edi - ;xor al,al - mov edi,dword[OpenDialog_data.filename_area] - mov ebx,edi ;copy text pointer - mov ecx,dword[edit1.max] - ;cld - repne scasb - sub edi,ebx ;edi = strlen(OpenDialog_data.filename_area) - mov ecx,edi - dec edi - mov [edit1.size],edi - mov [edit1.pos],edi - mov esi,dword[OpenDialog_data.filename_area] - mov edi,dword[edit1.text] - ;cld - rep movsb + push dword [OpenDialog_data.filename_area] + push dword edit1 + call dword [edit_box_set_text] push dword edit1 call dword [edit_box_draw] @@ -456,10 +444,11 @@ end if align 4 import_box_lib: - edit_box_draw dd aEdit_box_draw - edit_box_key dd aEdit_box_key - edit_box_mouse dd aEdit_box_mouse - ;version_ed dd aVersion_ed + edit_box_draw dd aEdit_box_draw + edit_box_key dd aEdit_box_key + edit_box_mouse dd aEdit_box_mouse + edit_box_set_text dd aEdit_box_set_text + ;version_ed dd aVersion_ed check_box_draw dd aCheck_box_draw check_box_mouse dd aCheck_box_mouse @@ -470,6 +459,7 @@ import_box_lib: aEdit_box_draw db 'edit_box',0 aEdit_box_key db 'edit_box_key',0 aEdit_box_mouse db 'edit_box_mouse',0 + aEdit_box_set_text db 'edit_box_set_text',0 ;aVersion_ed db 'version_ed',0 aCheck_box_draw db 'check_box_draw',0 diff --git a/programs/develop/libraries/box_lib/trunk/box_lib.asm b/programs/develop/libraries/box_lib/trunk/box_lib.asm index fce8ca5a4a..bcc18d5cff 100644 --- a/programs/develop/libraries/box_lib/trunk/box_lib.asm +++ b/programs/develop/libraries/box_lib/trunk/box_lib.asm @@ -125,6 +125,7 @@ dd sz_version, 0x00000001 dd sz_edit_box, edit_box dd sz_edit_box_key, edit_box_key dd sz_edit_box_mouse, edit_box_mouse +dd sz_edit_box_set_text, edit_box_set_text dd szVersion_ed, 0x00000001 dd sz_check_box_draw, check_box_draw @@ -222,6 +223,7 @@ sz_version db 'version',0 sz_edit_box db 'edit_box',0 sz_edit_box_key db 'edit_box_key',0 sz_edit_box_mouse db 'edit_box_mouse',0 +sz_edit_box_set_text db 'edit_box_set_text',0 szVersion_ed db 'version_ed',0 sz_check_box_draw db 'check_box_draw',0 diff --git a/programs/develop/libraries/box_lib/trunk/box_lib.mac b/programs/develop/libraries/box_lib/trunk/box_lib.mac index 8034c427ac..e56ef4a711 100644 --- a/programs/develop/libraries/box_lib/trunk/box_lib.mac +++ b/programs/develop/libraries/box_lib/trunk/box_lib.mac @@ -257,6 +257,7 @@ tl_err_load_caption equ 1b ; tl_err_load_info_size equ 100b ;не совпадает размер информационной структуры при открытии tl_load_mode_add equ 0x20000 ;опция считывания в режиме добавления информации tl_save_load_heder_size equ 26 ;размер заголовка для записи/чтения элементов +tl_offs_box equ 58 ;начало BOX структуры для tree_list ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;Basic macros for use TextEditor ; diff --git a/programs/develop/libraries/box_lib/trunk/doc/editbox/info_editbox.htm b/programs/develop/libraries/box_lib/trunk/doc/editbox/info_editbox.htm index b2effaee52..7342dcf905 100644 --- a/programs/develop/libraries/box_lib/trunk/doc/editbox/info_editbox.htm +++ b/programs/develop/libraries/box_lib/trunk/doc/editbox/info_editbox.htm @@ -12,6 +12,8 @@
@@ -30,6 +32,18 @@▌Єр ЇєэъЎш фюыцэр т√ч√трЄё яЁш ттюфх шэЇюЁьрЎшш ё ь√°ш.
+▌Єр ЇєэъЎш фюыцэр т√ч√трЄё яЁш ттюфх яхЁхЁшёютъх ¤ыхьхэЄр.
+ +▌Єр ЇєэъЎш ъюяшЁєхЄ ЄхъёЄ шч єърчрЄхы т ЄхъёЄютюх яюых. ┼ёыш ЄхъёЄ т єърчрЄхых юърцхЄё фышээхх ўхь фюяєёЄшь√щ т ¤ыхьхэЄх edit_box, Єю юэ чряш°хЄё эх тхё№. ╧юёых т√чютр фрээющ ЇєэъЎшш эхюсїюфшью яхЁхЁшёютрЄ№ юъэю ЇєэъЎшхщ edit_box_draw, шэрўх шчьхэхэш сєфєЄ ёЁрчє эх тшфэ√. ╧ЁшьхЁ шёяюы№чютрэш :
+push dword buf + push dword edit1 + call dword [edit_box_set_text] +......... +buf db '111-222-333',0+
уфх edit1 - ёЄЁєъЄєЁр ¤ыхьхэЄр edit_box; buf - сєЇхЁ, т ъюЄюЁюь ёюфхЁцшЄё єёЄрэртыштрхь√щ ЄхъёЄ.
+┬хЁёш ¤ыхьхэЄр
@@ -74,6 +88,6 @@╥хъёЄютюх яюых т Їюъєёх.
─юъєьхэЄрЎш юсэюты ырё№ яюёыхфэшщ Ёрч 10.01.10.
+─юъєьхэЄрЎш юсэюты ырё№ яюёыхфэшщ Ёрч 17.09.10.