diff --git a/programs/develop/libraries/box_lib/trunk/bl_sys.mac b/programs/develop/libraries/box_lib/trunk/bl_sys.mac index 87c5a24f2b..d3ab5821f7 100644 --- a/programs/develop/libraries/box_lib/trunk/bl_sys.mac +++ b/programs/develop/libraries/box_lib/trunk/bl_sys.mac @@ -3,6 +3,5 @@ include 'd_button.mac' ;macro implements dinamic_button include 'menubar.mac' ;macro implements menubar include 'filebrowser.mac' ;macro implements filebrowser include 'pathshow.mac' ;macro implements pathshow -include 't_edit.mac' ;macro implements text_editor include 'frame.mac' ;macro implements frame include 'progressbar.mac' ;macro implements progressbar diff --git a/programs/develop/libraries/box_lib/trunk/box_lib.asm b/programs/develop/libraries/box_lib/trunk/box_lib.asm index a8a7d38585..d537af005e 100644 --- a/programs/develop/libraries/box_lib/trunk/box_lib.asm +++ b/programs/develop/libraries/box_lib/trunk/box_lib.asm @@ -39,7 +39,7 @@ include 'checkbox.asm' ;checkbox ;-------------------------------------------------- ;radiobutton Group -include 'optionbox.asm' ;macro implements optionbox +include 'optionbox.asm' ;optionbox ;-------------------------------------------------- ;scrollbar Group @@ -71,7 +71,7 @@ use_file_browser ;-------------------------------------------------- ;tree list -include 'tree_list.asm' ;macro implements tree_list, image_list, list_box +include 'tree_list.asm' ;tree_list, list_box ;-------------------------------------------------- ;PathShow Group @@ -81,9 +81,8 @@ use_path_show ;-------------------------------------------------- ;text editor -;-------------------------------------------------- -align 16 -use_text_edit +include 't_edit.asm' ;text_editor + ;-------------------------------------------------- ;Frame Group ;-------------------------------------------------- @@ -118,7 +117,7 @@ proc draw_edge uses eax ebx ecx edx edi esi, box_l:dword, box_t:dword, box_w:dwo mov esi,dword[col_1] and esi,111111101111111011111110b - mov eax,13 + mov eax,SF_DRAW_RECT ;bottom line mov edx,dword[col_2] mov ebx,dword[box_l] diff --git a/programs/develop/libraries/box_lib/trunk/t_edit.mac b/programs/develop/libraries/box_lib/trunk/t_edit.asm similarity index 94% rename from programs/develop/libraries/box_lib/trunk/t_edit.mac rename to programs/develop/libraries/box_lib/trunk/t_edit.asm index 0c3b948b29..91b1b4df82 100644 --- a/programs/develop/libraries/box_lib/trunk/t_edit.mac +++ b/programs/develop/libraries/box_lib/trunk/t_edit.asm @@ -20,8 +20,6 @@ macro ColToIndexOffset ind_reg,out_reg { add out_reg,ted_key_words_data } -macro use_text_edit -{ TED_PANEL_NULL equ 0 ;нет открытой панели TED_PANEL_FIND equ 1 ;панель поиска TED_PANEL_SYNTAX equ 2 ;панель выбора файлов подсветки @@ -76,7 +74,7 @@ txtBuf db 'Buffer:',0 end if ;EvChar - таблица для фильтрования добавляемых символов, что-бы не попали лишние знаки -align 4 +align 16 EvChar db 0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0 db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 @@ -2003,20 +2001,20 @@ proc ted_set_undo jle @f ;if(tex[i].tc>ted_tim_ch){ // если создание символа было отменено - cmp [edx+10],eax + cmp [edx+symbol.tc],eax jle .no_u1 - mov dword [edx+10],0 - mov dword [edx+14],0 + mov dword [edx+symbol.tc],0 + mov dword [edx+symbol.td],0 - mov ebx,[edx+2] + mov ebx,[edx+symbol.perv] imul ebx,sizeof.symbol add ebx,ted_tex ;ebx=tex[i].perv - m2m dword [ebx+6],dword [edx+6] ;tex[tex[i].perv].next=tex[i].next; + m2m dword [ebx+symbol.next],dword [edx+symbol.next] ;tex[tex[i].perv].next=tex[i].next; - mov ebx,[edx+6] + mov ebx,[edx+symbol.next] imul ebx,sizeof.symbol add ebx,ted_tex ;ebx=tex[i].next - m2m dword [ebx+2],dword [edx+2] ;tex[tex[i].next].perv=tex[i].perv; + m2m dword [ebx+symbol.perv],dword [edx+symbol.perv] ;tex[tex[i].next].perv=tex[i].perv; cmp ted_ptr_free_symb,edx jle .no_cor_free @@ -2027,9 +2025,9 @@ proc ted_set_undo .no_u1: ;else if(tex[i].td>ted_tim_ch) tex[i].td=0; // если удаление символа было отменено - cmp [edx+14],eax + cmp [edx+symbol.td],eax jle .no_u2 - mov dword [edx+14],0 + mov dword [edx+symbol.td],0 .no_u2: call ted_get_text_next_pos @@ -2616,7 +2614,6 @@ proc ted_but_copy, edit:dword cmp ecx,12 je .end_f - inc ecx ;размер данных в буфере + символ завершения строки mov ebx,ted_buffer mov [ebx],ecx mcall SF_CLIPBOARD,SSF_WRITE_CB,ecx,ted_buffer @@ -4178,4 +4175,3 @@ align 4 popad ret endp -} \ No newline at end of file