fix header guard & typo

This commit is contained in:
idea4good 2019-08-19 16:03:27 +08:00
parent c9bbae7292
commit 7016b1c420
26 changed files with 59 additions and 59 deletions

View File

@ -406,7 +406,7 @@ int c_surface::set_frame_layer_visible_rect(c_rect& rect, unsigned int z_order)
return 0; return 0;
} }
int c_surface::flush_scrren(int left, int top, int right, int bottom) int c_surface::flush_screen(int left, int top, int right, int bottom)
{ {
if(left < 0 || left >= m_width || right < 0 || right >= m_width || if(left < 0 || left >= m_width || right < 0 || right >= m_width ||
top < 0 || top >= m_height || bottom < 0 || bottom >= m_height) top < 0 || top >= m_height || bottom < 0 || bottom >= m_height)

View File

@ -1,5 +1,5 @@
#ifndef API_H #ifndef GUILITE_CORE_INCLUDE_API_H
#define API_H #define GUILITE_CORE_INCLUDE_API_H
#define REAL_TIME_TASK_CYCLE_MS 50 #define REAL_TIME_TASK_CYCLE_MS 50

View File

@ -1,5 +1,5 @@
#ifndef AUDIO_MANGE_H #ifndef GUILITE_CORE_INCLUDE_AUDIO_H
#define AUDIO_MANGE_H #define GUILITE_CORE_INCLUDE_AUDIO_H
enum AUDIO_TYPE enum AUDIO_TYPE
{ {

View File

@ -1,5 +1,5 @@
#ifndef BITMAP_UNIT_H #ifndef GUILITE_CORE_INCLUDE_BITMAP_H
#define BITMAP_UNIT_H #define GUILITE_CORE_INCLUDE_BITMAP_H
#define DEFAULT_MASK_COLOR 0xFF080408 #define DEFAULT_MASK_COLOR 0xFF080408
class c_surface; class c_surface;

View File

@ -1,5 +1,5 @@
#ifndef CMD_TARGET_H #ifndef GUILITE_CORE_INCLUDE_CMD_TARGET_H
#define CMD_TARGET_H #define GUILITE_CORE_INCLUDE_CMD_TARGET_H
class c_cmd_target; class c_cmd_target;

View File

@ -1,5 +1,5 @@
#ifndef DISPLAY_H #ifndef GUILITE_CORE_INCLUDE_DISPLAY_H
#define DISPLAY_H #define GUILITE_CORE_INCLUDE_DISPLAY_H
#define SURFACE_CNT_MAX 6//root + pages #define SURFACE_CNT_MAX 6//root + pages

View File

@ -1,5 +1,5 @@
#ifndef MSG_H #ifndef GUILITE_CORE_INCLUDE_MSG_H
#define MSG_H #define GUILITE_CORE_INCLUDE_MSG_H
typedef struct typedef struct
{ {

View File

@ -1,5 +1,5 @@
#ifndef RECT_H #ifndef GUILITE_CORE_INCLUDE_RECT_H
#define RECT_H #define GUILITE_CORE_INCLUDE_RECT_H
class c_rect class c_rect
{ {

View File

@ -1,5 +1,5 @@
#ifndef RESOURCE_H #ifndef GUILITE_CORE_INCLUDE_RESOURCE_H
#define RESOURCE_H #define GUILITE_CORE_INCLUDE_RESOURCE_H
//BITMAP //BITMAP
typedef struct struct_bitmap_info typedef struct struct_bitmap_info

View File

@ -1,5 +1,5 @@
#ifndef SURFACE_H #ifndef GUILITE_CORE_INCLUDE_SURFACE_H
#define SURFACE_H #define GUILITE_CORE_INCLUDE_SURFACE_H
class c_frame_layer class c_frame_layer
{ {
@ -47,7 +47,7 @@ public:
fill_rect(rect.m_left, rect.m_top, rect.m_right, rect.m_bottom, rgb, z_order); fill_rect(rect.m_left, rect.m_top, rect.m_right, rect.m_bottom, rgb, z_order);
} }
int flush_scrren(int left, int top, int right, int bottom); int flush_screen(int left, int top, int right, int bottom);
bool is_valid(c_rect rect); bool is_valid(c_rect rect);
bool is_active() { return m_is_active; } bool is_active() { return m_is_active; }
c_display* get_display() { return m_display; } c_display* get_display() { return m_display; }

View File

@ -1,5 +1,5 @@
#ifndef MY_RESOURCE_H #ifndef GUILITE_CORE_INCLUDE_THEME_H
#define MY_RESOURCE_H #define GUILITE_CORE_INCLUDE_THEME_H
typedef struct struct_font_info FONT_INFO; typedef struct struct_font_info FONT_INFO;
typedef struct struct_color_rect COLOR_RECT; typedef struct struct_color_rect COLOR_RECT;

View File

@ -1,5 +1,5 @@
#ifndef WND_H #ifndef GUILITE_CORE_INCLUDE_WND_H
#define WND_H #define GUILITE_CORE_INCLUDE_WND_H
typedef struct struct_font_info FONT_INFO; typedef struct struct_font_info FONT_INFO;
typedef struct struct_color_rect COLOR_RECT; typedef struct struct_color_rect COLOR_RECT;

View File

@ -1,5 +1,5 @@
#ifndef WORD_UNIT_H #ifndef GUILITE_CORE_INCLUDE_WORD_H
#define WORD_UNIT_H #define GUILITE_CORE_INCLUDE_WORD_H
class c_surface; class c_surface;
class c_word class c_word

View File

@ -43,7 +43,7 @@ int c_slide_group::set_active_slide(int index, bool is_redraw)
{ {
c_rect rc; c_rect rc;
get_screen_rect(rc); get_screen_rect(rc);
m_slides[i]->get_surface()->flush_scrren(rc.m_left, rc.m_top, rc.m_right, rc.m_bottom); m_slides[i]->get_surface()->flush_screen(rc.m_left, rc.m_top, rc.m_right, rc.m_bottom);
} }
} }
else else

View File

@ -1,5 +1,5 @@
#ifndef BUTTON_H #ifndef GUILITE_WIDGETS_INCLUDE_BUTTON_H
#define BUTTON_H #define GUILITE_WIDGETS_INCLUDE_BUTTON_H
#define GL_BN_CLICKED 0x1111 #define GL_BN_CLICKED 0x1111
#define ON_GL_BN_CLICKED(ctrlId, func) \ #define ON_GL_BN_CLICKED(ctrlId, func) \

View File

@ -1,5 +1,5 @@
#ifndef DIALOG_H #ifndef GUILITE_WIDGETS_INCLUDE_DIALOG_H
#define DIALOG_H #define GUILITE_WIDGETS_INCLUDE_DIALOG_H
class c_surface; class c_surface;
class c_dialog; class c_dialog;

View File

@ -1,5 +1,5 @@
#ifndef EDIT_H #ifndef GUILITE_WIDGETS_INCLUDE_EDIT_H
#define EDIT_H #define GUILITE_WIDGETS_INCLUDE_EDIT_H
#define MAX_EDIT_STRLEN 32 #define MAX_EDIT_STRLEN 32

View File

@ -1,5 +1,5 @@
#ifndef GESTURE_H #ifndef GUILITE_WIDGETS_INCLUDE_GESTURE_H
#define GESTURE_H #define GUILITE_WIDGETS_INCLUDE_GESTURE_H
typedef enum{ typedef enum{
TOUCH_MOVE, TOUCH_MOVE,

View File

@ -1,5 +1,5 @@
#ifndef KEYBOARD_H #ifndef GUILITE_WIDGETS_INCLUDE_KEYBOARD_H
#define KEYBOARD_H #define GUILITE_WIDGETS_INCLUDE_KEYBOARD_H
#define KEYBORAD_CLICK 0x5014 #define KEYBORAD_CLICK 0x5014
#define ON_KEYBORAD_UPDATE(ctrlId, func) \ #define ON_KEYBORAD_UPDATE(ctrlId, func) \

View File

@ -1,5 +1,5 @@
#ifndef LABEL_H #ifndef GUILITE_WIDGETS_INCLUDE_LABEL_H
#define LABEL_H #define GUILITE_WIDGETS_INCLUDE_LABEL_H
class c_label : public c_wnd class c_label : public c_wnd
{ {

View File

@ -1,5 +1,5 @@
#ifndef LIST_BOX_H #ifndef GUILITE_WIDGETS_INCLUDE_LIST_BOX_H
#define LIST_BOX_H #define GUILITE_WIDGETS_INCLUDE_LIST_BOX_H
#define MAX_ITEM_NUM 4 #define MAX_ITEM_NUM 4
#define GL_LIST_CONFIRM 0x1 #define GL_LIST_CONFIRM 0x1

View File

@ -1,5 +1,5 @@
#ifndef PAGE_GROUP_H #ifndef GUILITE_WIDGETS_INCLUDE_SLIDE_GROUP_H
#define PAGE_GROUP_H #define GUILITE_WIDGETS_INCLUDE_SLIDE_GROUP_H
#define MAX_PAGES 5 #define MAX_PAGES 5

View File

@ -1,5 +1,5 @@
#ifndef SPIN_BOX_H #ifndef GUILITE_WIDGETS_INCLUDE_SPINBOX_H
#define SPIN_BOX_H #define GUILITE_WIDGETS_INCLUDE_SPINBOX_H
#define GL_SPIN_CONFIRM 0x2222 #define GL_SPIN_CONFIRM 0x2222
#define GL_SPIN_CHANGE 0x3333 #define GL_SPIN_CHANGE 0x3333

View File

@ -1,5 +1,5 @@
#ifndef TABLE_H #ifndef GUILITE_WIDGETS_INCLUDE_TABLE_H
#define TABLE_H #define GUILITE_WIDGETS_INCLUDE_TABLE_H
#define MAX_COL_NUM 30 #define MAX_COL_NUM 30
#define MAX_ROW_NUM 30 #define MAX_ROW_NUM 30

View File

@ -1,5 +1,5 @@
#ifndef WAVE_BUFFER_H #ifndef GUILITE_WIDGETS_INCLUDE_WAVE_BUFFER_H
#define WAVE_BUFFER_H #define GUILITE_WIDGETS_INCLUDE_WAVE_BUFFER_H
#define WAVE_BUFFER_LEN 1024 #define WAVE_BUFFER_LEN 1024
#define WAVE_READ_CACHE_LEN 8 #define WAVE_READ_CACHE_LEN 8

View File

@ -1,5 +1,5 @@
#ifndef WAVE_CTRL_H #ifndef GUILITE_WIDGETS_INCLUDE_WAVE_CTRL_H
#define WAVE_CTRL_H #define GUILITE_WIDGETS_INCLUDE_WAVE_CTRL_H
typedef enum typedef enum
{ {