added to the program styles to the window object

git-svn-id: svn://kolibrios.org@1904 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/kol_f_edit/ced_code_g.inc

@@ -1092,7 +1092,7 @@ proc get_code_window, p_obj:dword
 		insert_reg txt_eax
 		insert_nl
 
-		;mov ebx,...
+		;mov ebx,... § ¤ ¥âáï è¨à¨­  ®ª­  ¨ ®âáâ㯠®â «¥¢®£® ªà ï íªà ­ 
 		insert_tab
 		stdcall insert_text, txt_mov
 		insert_reg txt_ebx
@@ -1100,7 +1100,7 @@ proc get_code_window, p_obj:dword
 		stdcall insert_2_prop_16_bit, ebx,2,4
 		insert_nl
 
-		;mov ecx,...
+		;mov ecx,... § ¤ ¥âáï ¢ëá®â  ®ª­  ¨ ®âáâ㯠®â ¢¥àå­¥£® ªà ï íªà ­ 
 		insert_tab
 		stdcall insert_text, txt_mov
 		insert_reg txt_ecx
@@ -1108,7 +1108,7 @@ proc get_code_window, p_obj:dword
 		stdcall insert_2_prop_16_bit, ebx,3,5
 		insert_nl
 
-		;mov edx,...
+		;mov edx,... § ¤ ¥âáï 梥â à ¡®ç¥© ®¡« á⨠®ª­ 
 		insert_tab
 		stdcall insert_text, txt_mov
 		insert_reg txt_edx
@@ -1121,7 +1121,14 @@ proc get_code_window, p_obj:dword
 		stdcall insert_text, txt_or
 		insert_reg txt_edx
 		insert_coma
-		stdcall insert_text, txt_0x33000000
+		stdcall insert_text,txt_skob_o
+		stdcall insert_text_prop, ebx,1 ;áâ¨«ì ®ª­ 
+		stdcall insert_text,txt_shl_24
+		stdcall insert_text,txt_skob_c
+		stdcall insert_bit_prop, ebx,BIT_MOD_WI_CAPT
+		stdcall insert_bit_prop, ebx,BIT_MOD_WI_CORD_OTN_CL_OBL
+		stdcall insert_bit_prop, ebx,BIT_MOD_WI_REDR
+		stdcall insert_bit_prop, ebx,BIT_MOD_WI_GRAD
 		insert_nl
 
 		;mov edi,...
@@ -1414,7 +1421,6 @@ txt_ll_end db 'l_libs_end:',13,0
 txt_bit_29 db '0x20000000',0
 txt_bit_30 db '0x40000000',0
 ;txt_bit_31 db '0x80000000',0
-txt_0x33000000 db '0x33000000',0 ;tmp
 txt_struc db 'struc',0
 txt_t db 't',0
 txt_met_end db '.end',0
@@ -1437,6 +1443,7 @@ txt_align_4 db 'align 4',13,0
 txt_d_poi db ':',0
 txt_ret db 'ret',13,0
 txt_shl_16 db ' shl 16',0
+txt_shl_24 db ' shl 24',0
 txt_std_mouse_ed:
 	db 9,'stdcall [edit_box_mouse], ',0
 txt_std_init_cb:

programs/develop/kol_f_edit/ced_constr.inc

@@ -2,10 +2,20 @@
 ; ¢ í⮬ ä ©«¥ ᮡ࠭ë ä㭪樨 à¨áãî騥 ®ª­® ª®­áâàãªâ®à 
 ;
 
+;¯¥à¥¤¢¨£ ¥¬ ª®®à¤¨­ âë ®â­®á¨â¥«ì­® ᪨­ 
 macro move_to_skin coord_x,coord_y
 {
-	add coord_x,SKIN_W1
+	push eax
-	add coord_y,SKIN_H
+	mov eax,[obj_m_win] ;㪠§ â¥«ì ­  ®ª­®
+	cmp eax,0
+	je @f
+	test_bool_prop eax,BIT_MOD_WI_CORD_OTN_CL_OBL
+	;bt dword[[obj_m_win]+u_object.modif-u_object],n_prop
+	jnc @f
+		add coord_x,SKIN_W1
+		add coord_y,SKIN_H
+	@@:
+	pop eax
 }
 
 ;¯¥à¥à¨á®¢ª  ®ª­  ª®­áâàãªâ®à 

programs/develop/kol_f_edit/kol_f_edit.asm

@@ -20,7 +20,7 @@ include 'obj_codes.inc'
 
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc, dll.Load
 
-hed db 'kol_f_edit 31.12.10',0
+hed db 'kol_f_edit 10.03.11',0
 
 sizeof.TreeList equ 20 ;need for element 'tree_list'
 
@@ -47,10 +47,10 @@ BIT_MOD_ACI equ 0 ;
 BIT_MOD_ACM equ 1 ;嵼㏑漼<E38F91> 栽 禺閮
 BIT_MOD_ACD equ 2 ;<3B>限諝 恣磪芬恥
 BIT_MOD_ABU equ 3 ;屣鴽諲<E9B4BD>言 狎悖悚
-;CPP_MOD_WI_CA equ 16 ;áâ¨«ì ®ª­  ¯®¤¯¨áì
+BIT_MOD_WI_CAPT equ 0 ;áâ¨«ì ®ª­  ¯®¤¯¨áì
-;CPP_MOD_WI_AO equ 32 ;áâ¨«ì ®ª­  ª®®à¤¨­ âë ®â­®á¨â¥«ì­® ª«¨¥­â᪮© ®¡« áâ¨
+BIT_MOD_WI_CORD_OTN_CL_OBL equ 1 ;áâ¨«ì ®ª­  ª®®à¤¨­ âë ®â­®á¨â¥«ì­® ª«¨¥­â᪮© ®¡« áâ¨
-;CPP_MOD_WI_RD equ 64 ;áâ¨«ì ®ª­  ¯¥à¥à¨á®¢ª  ®ª­ 
+BIT_MOD_WI_REDR equ 2 ;áâ¨«ì ®ª­  ¯¥à¥à¨á®¢ª  ®ª­ 
-;CPP_MOD_WI_GR equ 128 ;áâ¨«ì ®ª­  £à ¤¨¥­â
+BIT_MOD_WI_GRAD equ 3 ;áâ¨«ì ®ª­  £à ¤¨¥­â
 BIT_MOD_CHE equ 0 ; ch_flag_en - ｃ﹤<EFBD83> CheckBox
 BIT_MOD_CHE_T equ 1 ;屣丞樍
 BIT_MOD_CHE_M equ 2 ;祚 璆凌飹

programs/develop/kol_f_edit/ob_o.asm

@@ -52,7 +52,7 @@ ObjOpt C_TXT,  1,0,'asm
 ObjOpt C_WND,  1,1,'Žª­®','§ £®«®¢®ª ®ª­ *áâ¨«ì ®ª­ *®âáâ㯠᫥¢ *®âáâ㯠ᢥàåã*è¨à¨­ *¢ëá®â *梥⠪«¨¥­â᪮© ®¡« áâ¨*梥⠧ £®«®¢ª  (¥á«¨ ¥áâì)',\
 	<98,100,110,120,130,150,170,  0,  0,  0, 0>,\
 	<12, -1, 15, 16, 26, 27, 25, 25, -1, -1, -1>,\
-	txt_bit_wnd
+	txt_bit_wnd,txt_bit_wnd.v
 ObjOpt C_INC,  1,0,'‚ª«î祭¨¥ ä ©« ','¨¬ï ä ©« *ª®¬¬¥­â à¨©',\
 	<100, 0,  0,  0,  0,  0,  0,  0,  0,  0, 0>,\
 	< 6,  5, -1, -1, -1, -1, -1, -1, -1, -1, -1>
@@ -86,10 +86,16 @@ txt_bit_auto db '
 	db '­ ¦ â¨ï ­  ª­®¯ª¨',0
 	db 0
 txt_bit_wnd db '¯®¤¯¨áì ®ª­ ',0
-	db '®ª­® ­¥ § ªà è¨¢ ¥â ª«¨¥­âáªãî ®¡«.',0
 	db 'ª®®à¤. ®â­®á¨â¥«ì­® ª«¨¥­â᪮© ®¡«.',0
+	db '®ª­® ­¥ § ªà è¨¢ ¥â ª«¨¥­âáªãî ®¡«.',0
 	db '£à ¤¨¥­â­ ï § «¨¢ª  à ¡. ®¡«.',0
 	db 0
+.v:
+	db '0x10000000',0
+	db '0x20000000',0
+	db '0x40000000',0
+	db '0x80000000',0
+	db 0
 txt_bit_edit db '¢ 䮪ãá¥',0
 	db 'æ¨äàë ®â 0-9',0
 	db 0