Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

eolite: fixed remaining issues with call edit_box_key_safe (edit_box_key_c)

Browse Source 
cmmlib: fixed edit_box_key_safe define, now edit_box_key_с the same + edit comments

git-svn-id: svn://kolibrios.org@9727 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Coldy 2022-02-23 13:15:01 +00:00
parent 4debc9fd1b
commit d9a89d8528
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/cmm/eolite/Eolite.c
View File

@ -380,7 +380,7 @@ void main()
} else { } else {
if (key_scancode == SCAN_CODE_ENTER) EventPopinClickOkay(); if (key_scancode == SCAN_CODE_ENTER) EventPopinClickOkay();
if (popin_string[0] != -1) { if (popin_string[0] != -1) {
edit_box_key stdcall (#popin_text, key_editbox); edit_box_key_c stdcall (#popin_text, key_editbox);
} }
} }
break; break;

7
programs/cmm/eolite/include/properties.h
View File

@ -209,10 +209,9 @@ void properties_dialog()
case SCAN_CODE_KEY_A: case SCAN_CODE_KEY_A:
case SCAN_CODE_KEY_C: case SCAN_CODE_KEY_C:
if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) { if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) {
EAX = key_editbox; edit_box_key_c stdcall(#file_name_ed,key_editbox);
edit_box_key stdcall(#file_name_ed); edit_box_key_c stdcall(#path_to_file_ed,key_editbox);
edit_box_key stdcall(#path_to_file_ed);
} }
} }
break; break;

3
programs/cmm/eolite/include/settings.h
View File

@ -67,8 +67,7 @@ void settings_dialog()
case evKey: case evKey:
GetKeys(); GetKeys();
if (key_scancode==SCAN_CODE_ESC) ExitSettings(); if (key_scancode==SCAN_CODE_ESC) ExitSettings();
EAX= key_ascii << 8; edit_box_key_c stdcall (#path_start_ed,key_ascii << 8);
edit_box_key stdcall (#path_start_ed);
break; break;
case evReDraw: case evReDraw:

12
programs/cmm/lib/obj/box_lib.h
View File

@ -27,12 +27,14 @@ extern dword frame_draw;
/* /*
Legacy support Legacy support
For new programs need to use edit_box_key_safe For new programs need to use edit_box_key_safe (or edit_box_key_c
TODO: change in all cmm programs edit_box_key to edit_box_key_safe, with a define below)
after that delete #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 #else
#ifndef INCLUDE_DLL_H #ifndef INCLUDE_DLL_H