From d9a89d8528c7a984f35f6a0bb8d9231e6240c77a Mon Sep 17 00:00:00 2001 From: Coldy Date: Wed, 23 Feb 2022 13:15:01 +0000 Subject: [PATCH] =?UTF-8?q?eolite:=20fixed=20remaining=20issues=20with=20c?= =?UTF-8?q?all=20edit=5Fbox=5Fkey=5Fsafe=20(edit=5Fbox=5Fkey=5Fc)=20cmmlib?= =?UTF-8?q?:=20fixed=20edit=5Fbox=5Fkey=5Fsafe=20define,=20now=20edit=5Fbo?= =?UTF-8?q?x=5Fkey=5F=D1=81=20the=20same=20+=20edit=20comments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://kolibrios.org@9727 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 2 +- programs/cmm/eolite/include/properties.h | 7 +++---- programs/cmm/eolite/include/settings.h | 3 +-- programs/cmm/lib/obj/box_lib.h | 12 +++++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index f7a6a9aba5..be3e7aefa0 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -380,7 +380,7 @@ void main() } else { if (key_scancode == SCAN_CODE_ENTER) EventPopinClickOkay(); if (popin_string[0] != -1) { - edit_box_key stdcall (#popin_text, key_editbox); + edit_box_key_c stdcall (#popin_text, key_editbox); } } break; diff --git a/programs/cmm/eolite/include/properties.h b/programs/cmm/eolite/include/properties.h index 2dba936a92..c3c1f32c18 100644 --- a/programs/cmm/eolite/include/properties.h +++ b/programs/cmm/eolite/include/properties.h @@ -209,10 +209,9 @@ void properties_dialog() case SCAN_CODE_KEY_A: case SCAN_CODE_KEY_C: - if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) { - EAX = key_editbox; - edit_box_key stdcall(#file_name_ed); - edit_box_key stdcall(#path_to_file_ed); + if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) { + edit_box_key_c stdcall(#file_name_ed,key_editbox); + edit_box_key_c stdcall(#path_to_file_ed,key_editbox); } } break; diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index bfbae19288..801b10feec 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -67,8 +67,7 @@ void settings_dialog() case evKey: GetKeys(); if (key_scancode==SCAN_CODE_ESC) ExitSettings(); - EAX= key_ascii << 8; - edit_box_key stdcall (#path_start_ed); + edit_box_key_c stdcall (#path_start_ed,key_ascii << 8); break; case evReDraw: diff --git a/programs/cmm/lib/obj/box_lib.h b/programs/cmm/lib/obj/box_lib.h index 6e8f79c35f..58863581f4 100644 --- a/programs/cmm/lib/obj/box_lib.h +++ b/programs/cmm/lib/obj/box_lib.h @@ -27,12 +27,14 @@ extern dword frame_draw; /* Legacy support - For new programs need to use edit_box_key_safe - TODO: change in all cmm programs edit_box_key to edit_box_key_safe, - after that delete #define below - + For new programs need to use edit_box_key_safe (or edit_box_key_c + with a define below) + TODO: change in all cmm programs edit_box_key to edit_box_key_safe (edit_box_key_c) + See examples in eolite and imgedit + + This define changed all edit_box_key_c to edit_box_key_safe identifier's */ -#define edit_box_key edit_box_key_safe +#define edit_box_key_c edit_box_key_safe #else #ifndef INCLUDE_DLL_H