From c002678fafef502c6023b0558a11091d7afe1e19 Mon Sep 17 00:00:00 2001 From: "Alexey Teplov (" Date: Sat, 17 Oct 2009 04:13:20 +0000 Subject: [PATCH] Some programs already wrote on C will have using new structure an edit_box and they will have new ability to use system library box_lib.obj. git-svn-id: svn://kolibrios.org@1218 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/Eolite/trunk/Eolite.c-- | 6 +++--- programs/fs/Eolite/trunk/compile.bat | 6 ++++-- programs/fs/Eolite/trunk/lib/edit_box_lib.h-- | 2 +- programs/other/table/hello.cpp | 7 ++++--- programs/other/table/use_library.h | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index fb294bac4d..9102ff11bf 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -37,12 +37,12 @@ byte path[256]="/rd/1/", byte PathHistory[2560]; dword file_mas[6898]; -int j, i; +int j, i, mouse_dd; dword stak[100]=0; //окно About -edit_box edit1= {250,247,13,0xffffff,videlenie,0xD3DDEB,0xffffff,0,248,#edit_path,64,6,6}; -edit_box edit2= {250,213,80,0xFFFFCC,videlenie,0xFFFFCC,0xffffff,0,248,#file_name,64,6,6}; +edit_box edit1= {250,247,13,0xffffff,videlenie,0xD3DDEB,0xffffff,0,248,#edit_path,#mouse_dd,64,6,6}; +edit_box edit2= {250,213,80,0xFFFFCC,videlenie,0xFFFFCC,0xffffff,0,248,#file_name,#mouse_dd,64,6,6}; proc_info Form; dword buf, off; //для текста и буфера diff --git a/programs/fs/Eolite/trunk/compile.bat b/programs/fs/Eolite/trunk/compile.bat index c68f18e80a..e710c0424b 100644 --- a/programs/fs/Eolite/trunk/compile.bat +++ b/programs/fs/Eolite/trunk/compile.bat @@ -1,5 +1,7 @@ -..\C--\c-- Eolite.c-- +REM ..\C--\c-- Eolite.c-- +@c-- Eolite.c-- del Eolite rename Eolite.com Eolite -..\C--\kpack Eolite +REM ..\C--\kpack Eolite +@kpack Eolite pause \ No newline at end of file diff --git a/programs/fs/Eolite/trunk/lib/edit_box_lib.h-- b/programs/fs/Eolite/trunk/lib/edit_box_lib.h-- index c72a096b09..5f40cb612c 100644 --- a/programs/fs/Eolite/trunk/lib/edit_box_lib.h-- +++ b/programs/fs/Eolite/trunk/lib/edit_box_lib.h-- @@ -15,7 +15,7 @@ char aEdit_box_mouse[15] = "edit_box_mouse\0"; struct edit_box{ dword width, left, top, color, shift_color, focus_border_color, blur_border_color, -text_color, max, text, flags, size, pos, offset, cl_curs_x, cl_curs_y, shift, shift_old; +text_color, max, text, mouse_variable, flags, size, pos, offset, cl_curs_x, cl_curs_y, shift, shift_old; }; diff --git a/programs/other/table/hello.cpp b/programs/other/table/hello.cpp index 0fb5841e81..d8fd21cb08 100644 --- a/programs/other/table/hello.cpp +++ b/programs/other/table/hello.cpp @@ -74,10 +74,11 @@ int win_x, win_y; // нижняя панель с кнопками и полем ввода #define MENU_PANEL_HEIGHT 40 Dword panel_y = 0; - +Dword mouse_dd; // для поля ввода + char edit_text[256] = ""; -edit_box cell_box = {0,9*8-5,WND_H - 16-32,0xffffff,0x6a9480,0,0x808080,0,255,(dword)&edit_text,0}; +edit_box cell_box = {0,9*8-5,WND_H - 16-32,0xffffff,0x6a9480,0,0x808080,0,255,(dword)&edit_text,(dword)&mouse_dd,0}; // ячейки - их параметры и текст DWORD def_col_width = 80, def_row_height = 16; @@ -121,7 +122,7 @@ DWORD nx = 0, ny = 0; // редактирование имени файла bool fn_edit = 0; char fname[256]; -edit_box file_box = {0,9*8-5,WND_H - 16-32,0xffffff,0x6a9480,0,0x808080,0,255,(dword)&fname,0}; +edit_box file_box = {0,9*8-5,WND_H - 16-32,0xffffff,0x6a9480,0,0x808080,0,255,(dword)&fname,(dword)&mouse_dd,0}; // изменение размеров #define SIZE_X 1 // состояние diff --git a/programs/other/table/use_library.h b/programs/other/table/use_library.h index ab8364619a..8934f2a64a 100644 --- a/programs/other/table/use_library.h +++ b/programs/other/table/use_library.h @@ -34,7 +34,7 @@ dword dummy = 0; struct edit_box{ dword width, left, top, color, shift_color, focus_border_color, blur_border_color, -text_color, max, text, flags, size, pos, offset, cl_curs_x, cl_curs_y, shift, shift_old; +text_color, max, text, mouse_variable, flags, size, pos, offset, cl_curs_x, cl_curs_y, shift, shift_old; }; void load_edit_box()