From 34ed14415e41c4626f70e3492ff70a51ae499427 Mon Sep 17 00:00:00 2001 From: IgorA Date: Tue, 12 Mar 2013 12:51:52 +0000 Subject: [PATCH] t_edit: small fix in function open file git-svn-id: svn://kolibrios.org@3366 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/other/t_edit/t_button.inc | 2 ++ programs/other/t_edit/t_data.inc | 27 +++++++++++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/programs/other/t_edit/t_button.inc b/programs/other/t_edit/t_button.inc index f66ca0ef14..6b2da27c1a 100644 --- a/programs/other/t_edit/t_button.inc +++ b/programs/other/t_edit/t_button.inc @@ -93,6 +93,8 @@ ted_but_open_file: stdcall [mb_create],msgbox_5,thread ;message: save changes in file? stdcall [mb_setfunctions],msgbox_5_funct jmp .ret_f + .no_msg: ;метка для вызова функции через кнопку в сообщении msgbox_5 + pushad @@: copy_path open_dialog_name,communication_area_default_path,file_name,0 diff --git a/programs/other/t_edit/t_data.inc b/programs/other/t_edit/t_data.inc index 496614822f..4871c365d2 100644 --- a/programs/other/t_edit/t_data.inc +++ b/programs/other/t_edit/t_data.inc @@ -486,7 +486,7 @@ tree_file_struct: if lang eq ru -hed db 'Текстовый редактор 14.02.13',0 ;подпись окна +hed db 'Текстовый редактор 12.03.13',0 ;подпись окна menu_text_area: db 'Файл',0 @@ -514,10 +514,6 @@ msgbox_2: db 'Не сохранять',0 db 'Отмена',0 db 0 -msgbox_2_funct: - dd On_SaveAndNewFile - dd On_NewFile - dd 0 msgbox_3: db 1,0 @@ -548,9 +544,6 @@ msgbox_5: db 'Не сохранять',0 db 'Отмена',0 db 0 -msgbox_5_funct: - dd but_no_msg_OpenFile - dd 0 msgbox_6: db 1,0 @@ -604,7 +597,7 @@ txtFormatApply db ' else -hed db 'Text editor 14.02.13',0 +hed db 'Text editor 12.03.13',0 menu_text_area: db 'File',0 @@ -632,10 +625,6 @@ msgbox_2: db 'Discard',0 db 'Cancel',0 db 0 -msgbox_2_funct: - dd On_SaveAndNewFile - dd On_NewFile - dd 0 msgbox_3: db 1,0 @@ -666,9 +655,6 @@ msgbox_5: db 'Discard',0 db 'Cancel',0 db 0 -msgbox_5_funct: - dd but_no_msg_OpenFile - dd 0 msgbox_6: db 1,0 @@ -722,6 +708,15 @@ txtFormatApply db 'Apply',0 end if +;функции для кнопок в сообщениях +msgbox_2_funct: + dd On_SaveAndNewFile + dd On_NewFile + dd 0 +msgbox_5_funct: + dd ted_but_open_file.no_msg + dd 0 + KM_SHIFT equ 0x00010000 KM_CTRL equ 0x00020000 KM_ALT equ 0x00040000