github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add LV_ prefix to symbols and vhange USE_LV_... to LV_USE_...

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-03-07 00:05:16 +01:00
parent 210de388d9
commit 702fb9565d
136 changed files with 1505 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lv_objx/lv_win.h
View File

@@ -19,24 +19,24 @@ extern "C" {
#include "../../lv_conf.h"
#endif
#if USE_LV_WIN != 0
#if LV_USE_WIN != 0
/*Testing of dependencies*/
#if USE_LV_BTN == 0
#error "lv_win: lv_btn is required. Enable it in lv_conf.h (USE_LV_BTN 1) "
#if LV_USE_BTN == 0
#error "lv_win: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) "
#endif
#if USE_LV_LABEL == 0
#error "lv_win: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL 1) "
#if LV_USE_LABEL == 0
#error "lv_win: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) "
#endif
#if USE_LV_IMG == 0
#error "lv_win: lv_img is required. Enable it in lv_conf.h (USE_LV_IMG 1) "
#if LV_USE_IMG == 0
#error "lv_win: lv_img is required. Enable it in lv_conf.h (LV_USE_IMG 1) "
#endif
#if USE_LV_PAGE == 0
#error "lv_win: lv_page is required. Enable it in lv_conf.h (USE_LV_PAGE 1) "
#if LV_USE_PAGE == 0
#error "lv_win: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) "
#endif
#include "../lv_core/lv_obj.h"
@@ -115,11 +115,11 @@ lv_obj_t * lv_win_add_btn(lv_obj_t * win, const void * img_src, lv_event_cb_t ev
*====================*/
/**
* A release action which can be assigned to a window control button to close it
* @param btn pointer to the released button
* @return always LV_ACTION_RES_INV because the button is deleted with the window
* Can be assigned to a window control button to close the window
* @param btn pointer to the control button on teh widows header
* @param evet the event type
*/
lv_res_t lv_win_close_action(lv_obj_t * btn);
void lv_win_close_event(lv_obj_t * btn, lv_event_t event);
/**
* Set the title of a window
@@ -273,7 +273,7 @@ static inline void lv_win_scroll_ver(lv_obj_t * win, lv_coord_t dist)
* MACROS
**********************/
#endif /*USE_LV_WIN*/
#endif /*LV_USE_WIN*/
#ifdef __cplusplus
} /* extern "C" */