From e652fe540f417dd8c93070f004b7e6106dfdcd35 Mon Sep 17 00:00:00 2001 From: "Alexey Teplov (" Date: Fri, 9 Mar 2007 08:41:43 +0000 Subject: [PATCH] upgrade git-svn-id: svn://kolibrios.org@403 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../examples/editbox/trunk/EDITBOX.INC | 23 +------------------ .../examples/editbox/trunk/editbox.asm | 2 +- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/programs/develop/examples/editbox/trunk/EDITBOX.INC b/programs/develop/examples/editbox/trunk/EDITBOX.INC index 5e1acc6b5c..3e0badb870 100644 --- a/programs/develop/examples/editbox/trunk/EDITBOX.INC +++ b/programs/develop/examples/editbox/trunk/EDITBOX.INC @@ -1058,7 +1058,7 @@ struc edit_box width,left,top,color,focus_border_color,\ .max dd max .text dd text .flags dw flags+0 -.size dd 0 +.size dd size+0 .pos dd 0 .offset dd 0 .cl_curs_x dd 0 @@ -1067,27 +1067,6 @@ struc edit_box width,left,top,color,focus_border_color,\ .shift_old dd 0 } -struc edit_box1 width,left,top,color,focus_border_color,\ - blur_border_color,text_color,max,text,flags,ed_size -{ -.width dd width -.left dd left -.top dd top -.color dd color -.focus_border_color dd focus_border_color -.blur_border_color dd blur_border_color -.text_color dd text_color -.max dd max -.text dd text -.flags dw flags+0 -.size dd ed_size -.pos dd 0 -.offset dd 0 -.cl_curs_x dd 0 -.cl_curs_y dd 0 -.shift dd 0 -.shift_old dd 0 -} macro edit_boxes_set_sys_color start,end,color_table { diff --git a/programs/develop/examples/editbox/trunk/editbox.asm b/programs/develop/examples/editbox/trunk/editbox.asm index 8c0fec0e9b..13c82a9a85 100644 --- a/programs/develop/examples/editbox/trunk/editbox.asm +++ b/programs/develop/examples/editbox/trunk/editbox.asm @@ -82,7 +82,7 @@ draw_window: ; ;DATA данные editboxes: edit1 edit_box 168,5,10,0xffffff,0,0,0,99,ed_buffer.2,ed_figure_only -edit2 edit_box1 250,5,30,0xffffff,0,0,0,308,hed,ed_focus,53 +edit2 edit_box 250,5,30,0xffffff,0,0,0,308,hed,ed_focus,53 edit3 edit_box 35,5,50,0xffffff,0,0,0,9,ed_buffer.3,ed_figure_only edit4 edit_box 16,5,70,0xffffff,0,0,0,1,ed_buffer.4,ed_figure_only editboxes_end: