From 7877352be7489045369861e8a41410db322ed56d Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Tue, 21 Jun 2016 23:47:56 +0000 Subject: [PATCH] add box_lib wrapper: frame, progress bar git-svn-id: svn://kolibrios.org@6449 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../C_Layer/libguic_kolibri/kolibri_gui_elements.h | 12 ++++++++++++ contrib/C_Layer/libguic_kolibri/loadboxlib.asm | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/contrib/C_Layer/libguic_kolibri/kolibri_gui_elements.h b/contrib/C_Layer/libguic_kolibri/kolibri_gui_elements.h index c7beda49ab..ceb0afdb55 100644 --- a/contrib/C_Layer/libguic_kolibri/kolibri_gui_elements.h +++ b/contrib/C_Layer/libguic_kolibri/kolibri_gui_elements.h @@ -5,6 +5,8 @@ #include "kolibri_editbox.h" #include "kolibri_checkbox.h" #include "kolibri_button.h" +#include "kolibri_progressbar.h" +#include "kolibri_frame.h" /* enum KOLIBRI_GUI_ELEMENT_TYPE contains all available GUI items from box_lib */ /* More elements can be added from other libraries as required */ @@ -82,6 +84,16 @@ kolibri_gui_op_table[KOLIBRI_BUTTON].redraw_fn = (cb_elem_boxlib)draw_button; kolibri_gui_op_table[KOLIBRI_BUTTON].mouse_fn = NULL; kolibri_gui_op_table[KOLIBRI_BUTTON].key_fn = NULL; +/* Setting up functions for progress bar GUI elements*/ +kolibri_gui_op_table[KOLIBRI_PROGRESS_BAR].redraw_fn = (cb_elem_boxlib)progressbar_draw; +kolibri_gui_op_table[KOLIBRI_PROGRESS_BAR].mouse_fn = NULL; +kolibri_gui_op_table[KOLIBRI_PROGRESS_BAR].key_fn = NULL; + +/* Setting up functions for frame GUI elements*/ +kolibri_gui_op_table[KOLIBRI_FRAME].redraw_fn = (cb_elem_boxlib)frame_draw; +kolibri_gui_op_table[KOLIBRI_FRAME].mouse_fn = NULL; +kolibri_gui_op_table[KOLIBRI_FRAME].key_fn = NULL; + } /* Create a new main GUI window for KolibriOS */ diff --git a/contrib/C_Layer/libguic_kolibri/loadboxlib.asm b/contrib/C_Layer/libguic_kolibri/loadboxlib.asm index 2b9bc73898..bd358d191a 100644 --- a/contrib/C_Layer/libguic_kolibri/loadboxlib.asm +++ b/contrib/C_Layer/libguic_kolibri/loadboxlib.asm @@ -134,3 +134,8 @@ public edit_box_mouse as '_edit_box_mouse' public check_box_draw2 as '_check_box_draw2' public check_box_mouse2 as '_check_box_mouse2' + +public progressbar_draw as '_progressbar_draw' +public progressbar_progress as '_progressbar_progress' + +public frame_draw as '_frame_draw'