libc.obj: headers update (now used true functions with attributes instead of pointers)
git-svn-id: svn://kolibrios.org@9810 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
#include <sys/ksys.h>
|
||||
|
||||
typedef unsigned color_t;
|
||||
int kolibri_boxlib_init(void);
|
||||
|
||||
/* flags meaning */
|
||||
#define ed_figure_only 0b1000000000000000 // одни символы
|
||||
@@ -69,10 +68,10 @@ typedef struct {
|
||||
uint32_t ar_offset;
|
||||
} __attribute__((__packed__)) scrollbar;
|
||||
|
||||
extern void __stdcall (*scrollbar_h_draw)(scrollbar*);
|
||||
extern void __stdcall (*scrollbar_h_mouse)(scrollbar*);
|
||||
extern void __stdcall (*scrollbar_v_draw)(scrollbar*);
|
||||
extern void __stdcall (*scrollbar_v_mouse)(scrollbar*);
|
||||
DLLAPI void __stdcall scrollbar_h_draw(scrollbar*);
|
||||
DLLAPI void __stdcall scrollbar_h_mouse(scrollbar*);
|
||||
DLLAPI void __stdcall scrollbar_v_draw(scrollbar*);
|
||||
DLLAPI void __stdcall scrollbar_v_mouse(scrollbar*);
|
||||
|
||||
// CHECKBOX
|
||||
typedef struct {
|
||||
@@ -89,9 +88,9 @@ typedef struct {
|
||||
unsigned int size_of_str;
|
||||
} check_box;
|
||||
|
||||
extern void __stdcall (*check_box_draw2)(check_box*);
|
||||
extern void __stdcall (*check_box_mouse2)(check_box*);
|
||||
extern void __stdcall (*init_checkbox2)(check_box*);
|
||||
DLLAPI void __stdcall check_box_draw2(check_box*);
|
||||
DLLAPI void __stdcall check_box_mouse2(check_box*);
|
||||
DLLAPI void __stdcall init_checkbox2(check_box*);
|
||||
|
||||
// DBUTTON
|
||||
typedef struct {
|
||||
@@ -111,8 +110,8 @@ typedef struct {
|
||||
uint32_t click; // clicked - 1, zero it after tested
|
||||
} pict_button;
|
||||
|
||||
extern void __stdcall (*dynamic_button_draw)(pict_button*);
|
||||
extern void __stdcall (*dynamic_button_mouse)(pict_button*);
|
||||
DLLAPI void __stdcall dynamic_button_draw(pict_button*);
|
||||
DLLAPI void __stdcall dynamic_button_mouse(pict_button*);
|
||||
|
||||
// EDITBOX
|
||||
|
||||
@@ -144,12 +143,12 @@ typedef struct edit_box_t {
|
||||
} edit_box;
|
||||
#pragma pack(pop)
|
||||
|
||||
extern void __stdcall (*edit_box_draw)(edit_box*);
|
||||
extern void __stdcall (*edit_box_key)(edit_box*, unsigned int key_val);
|
||||
extern void __stdcall (*edit_box_mouse)(edit_box*);
|
||||
extern void __stdcall (*edit_box_set_text)(edit_box*, char*);
|
||||
DLLAPI void __stdcall edit_box_draw(edit_box*);
|
||||
DLLAPI void __stdcall edit_box_key(edit_box*, unsigned int key_val);
|
||||
DLLAPI void __stdcall edit_box_mouse(edit_box*);
|
||||
DLLAPI void __stdcall edit_box_set_text(edit_box*, char*);
|
||||
|
||||
extern void __stdcall (*edit_box_key_safe)(edit_box* e, ksys_oskey_t ch);
|
||||
DLLAPI void __stdcall edit_box_key_safe(edit_box* e, ksys_oskey_t ch);
|
||||
|
||||
// FRAME
|
||||
typedef struct {
|
||||
@@ -167,7 +166,7 @@ typedef struct {
|
||||
color_t font_bg_color;
|
||||
} frame;
|
||||
|
||||
extern void __stdcall (*frame_draw)(frame*);
|
||||
DLLAPI void __stdcall frame_draw(frame*);
|
||||
|
||||
// MENUBAR
|
||||
typedef struct
|
||||
@@ -208,9 +207,9 @@ typedef struct
|
||||
uint32_t get_mouse_flag;
|
||||
} menubar;
|
||||
|
||||
extern void __stdcall (*menu_bar_draw)(menubar*);
|
||||
extern void __stdcall (*menu_bar_mouse)(menubar*);
|
||||
extern void __stdcall (*menu_bar_activate)(menubar*);
|
||||
DLLAPI void __stdcall menu_bar_draw(menubar*);
|
||||
DLLAPI void __stdcall menu_bar_mouse(menubar*);
|
||||
DLLAPI void __stdcall menu_bar_activate(menubar*);
|
||||
|
||||
// OPTIONBOX
|
||||
typedef struct option_box_t {
|
||||
@@ -227,8 +226,8 @@ typedef struct option_box_t {
|
||||
uint32_t flags;
|
||||
} __attribute__((__packed__)) option_box;
|
||||
|
||||
extern void __stdcall (*option_box_draw)(option_box**);
|
||||
extern void __stdcall (*option_box_mouse)(option_box**);
|
||||
DLLAPI void __stdcall option_box_draw(option_box**);
|
||||
DLLAPI void __stdcall option_box_mouse(option_box**);
|
||||
|
||||
// PATHSHOW
|
||||
typedef struct {
|
||||
@@ -245,8 +244,8 @@ typedef struct {
|
||||
uint32_t temp_text_length;
|
||||
} __attribute__((__packed__)) pathview;
|
||||
|
||||
extern void __stdcall (*path_show_prepare)(pathview*);
|
||||
extern void __stdcall (*path_show_draw)(pathview*);
|
||||
DLLAPI void __stdcall path_show_prepare(pathview*);
|
||||
DLLAPI void __stdcall path_show_draw(pathview*);
|
||||
|
||||
// PROGRESSBAR
|
||||
typedef struct {
|
||||
@@ -263,7 +262,7 @@ typedef struct {
|
||||
unsigned int frame_color;
|
||||
} progressbar;
|
||||
|
||||
extern void __stdcall (*progressbar_draw)(progressbar*);
|
||||
extern void __stdcall (*progressbar_progress)(progressbar*);
|
||||
DLLAPI void __stdcall progressbar_draw(progressbar*);
|
||||
DLLAPI void __stdcall progressbar_progress(progressbar*);
|
||||
|
||||
#endif /* KOLIBRI_BOXLIB_H */
|
||||
|
Reference in New Issue
Block a user