From 01fad46faca02eeb5c98786cb3a853b18bb080b5 Mon Sep 17 00:00:00 2001 From: Akyltist Date: Tue, 8 Apr 2014 05:39:58 +0000 Subject: [PATCH] add struct "sys_colors" in "macros.inc" git-svn-id: svn://kolibrios.org@4795 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/macros.inc | 133 ++++++++++++++++++++++++++++++-------------- 1 file changed, 92 insertions(+), 41 deletions(-) diff --git a/programs/macros.inc b/programs/macros.inc index 9d4c4ea837..d261204a69 100644 --- a/programs/macros.inc +++ b/programs/macros.inc @@ -1,47 +1,47 @@ @^ fix macro comment { ^@ fix } -; ------------------------- -macro library [lname,fname] -{ - forward - dd __#lname#_library_table__,__#lname#_library_name__ - common - dd 0 - forward - align 4 - __#lname#_library_name__ db fname,0 -} - -macro import lname,[name,sname] -{ - common - align 4 - __#lname#_library_table__: - forward - if used name - name dd __#name#_import_name__ - end if - common - dd 0 - forward - if used name - align 4 - __#name#_import_name__ db sname,0 - end if -} - -macro export [name,sname] -{ - forward - dd __#name#_export_name__,name - common - dd 0 - forward - align 4 - __#name#_export_name__ db sname,0 -} -; ------------------------- +; ------------------------- +macro library [lname,fname] +{ + forward + dd __#lname#_library_table__,__#lname#_library_name__ + common + dd 0 + forward + align 4 + __#lname#_library_name__ db fname,0 +} + +macro import lname,[name,sname] +{ + common + align 4 + __#lname#_library_table__: + forward + if used name + name dd __#name#_import_name__ + end if + common + dd 0 + forward + if used name + align 4 + __#name#_import_name__ db sname,0 + end if +} + +macro export [name,sname] +{ + forward + dd __#name#_export_name__,name + common + dd 0 + forward + align 4 + __#name#_export_name__ db sname,0 +} +; ------------------------- macro m2m dest,src { push src @@ -507,6 +507,57 @@ struct system_colors work_graph dd ? ends +struct sys_colors + menu_body dd ? + 3d_face dd ? + 3d_dark dd ? + 3d_light dd ? + win_title dd ? + win_body dd ? + btn_face dd ? + btn_text dd ? + win_text dd ? + panel_frame dd ? + win_face dd ? + win_inface dd ? + win_frame dd ? + win_inframe dd ? + win_border dd ? + win_inborder dd ? + win_graytext dd ? + menu_frame dd ? + menu_text dd ? + panel_body dd ? + panel_text dd ? + hint_frame dd ? + hint_body dd ? + hint_text dd ? + btn_inface dd ? + btn_fcface dd ? + btn_frame dd ? + btn_inframe dd ? + btn_fcframe dd ? + btn_intext dd ? + btn_fctext dd ? + gui_shadow dd ? + gui_face dd ? + gui_inface dd ? + gui_fcface dd ? + gui_frame dd ? + gui_inframe dd ? + gui_fcframe dd ? + gui_text dd ? + gui_intext dd ? + gui_fctext dd ? + gui_select dd ? + res_var_a dd ? + res_var_b dd ? + res_var_c dd ? + res_var_d dd ? + res_var_e dd ? + res_var_f dd ? +ends + struct FILEDATE Second db ? Minute db ?