fix identifier violation

2025-01-29 17:22:55 +08:00 · 2019-02-02 11:30:40 +08:00 · 2019-02-02 11:30:40 +08:00 · b4ceabfc92
commit b4ceabfc92
parent 7c24c78575
24 changed files with 95 additions and 95 deletions
--- a/README.md
+++ b/README.md
@ -73,7 +73,7 @@ GuiLite只是一个框架，本身并不能生成UI。为了能够展示如何
 | HelloAnimation | Windows, Linux | 动画的应用 | [编译/运行](https://gitee.com/idea4good/GuiLiteSamples/blob/master/HelloAnimation/README.md) | 初级 |
 | HelloParticle | Windows, Linux, STM32F103, STM32F429 | 粒子效果的应用 | [编译/运行](https://gitee.com/idea4good/GuiLiteSamples/blob/master/HelloParticle/README.md) | 初级 |
 | HelloSlide | Windows, Linux | 滑屏界面的应用 | [编译/运行](https://gitee.com/idea4good/GuiLiteSamples/blob/master/HelloSlide/README.md) | 中级 |
-| HelloWave | Windows, Linux, STM32F103, STM32F429 | 波形控件的应用 | [编译/运行](https://gitee.com/idea4good/GuiLiteSamples/blob/master/HelloWave/README.md) | 中级 |
+| HelloWave | Windows, Linux, STM32F103, STM32F429 | 波形控件的应用，及单片机移植办法 | [编译/运行](https://gitee.com/idea4good/GuiLiteSamples/blob/master/HelloWave/README.md) | 中级 |
 | HostMonitor | iOS, Mac, Android, Windows, Linux | 创建复杂界面，扩展自定义控件，适配全平台 | [编译/运行](https://gitee.com/idea4good/GuiLiteSamples/blob/master/HostMonitor/README.md) | 高级 |

 ## 开发文档
--- a/core/core_include/api.h
+++ b/core/core_include/api.h
@ -1,5 +1,5 @@
-#ifndef _API_H_
-#define _API_H_
+#ifndef API_H
+#define API_H

 #define REAL_TIME_TASK_CYCLE_MS		50
 #define XXX		-999
--- a/core/core_include/audio.h
+++ b/core/core_include/audio.h
@ -1,5 +1,5 @@
-#ifndef __AUDIO_MANGE_H__
-#define __AUDIO_MANGE_H__
+#ifndef AUDIO_MANGE_H
+#define AUDIO_MANGE_H

 enum AUDIO_TYPE
 {
--- a/core/core_include/bitmap.h
+++ b/core/core_include/bitmap.h
@ -1,5 +1,5 @@
-#ifndef _BITMAP_UNIT_H_
-#define _BITMAP_UNIT_H_
+#ifndef BITMAP_UNIT_H
+#define BITMAP_UNIT_H

 class c_surface;
 class c_bitmap
--- a/core/core_include/display.h
+++ b/core/core_include/display.h
@ -1,5 +1,5 @@
-#ifndef _DISPLAY_H_
-#define _DISPLAY_H_
+#ifndef DISPLAY_H
+#define DISPLAY_H

 #define SURFACE_CNT_MAX	6//root + pages

--- a/core/core_include/msg.h
+++ b/core/core_include/msg.h
@ -1,5 +1,5 @@
-#ifndef _MSG_H
-#define _MSG_H
+#ifndef MSG_H
+#define MSG_H

 typedef struct
 {
--- a/core/core_include/rect.h
+++ b/core/core_include/rect.h
@ -1,5 +1,5 @@
-#ifndef _RECT_H
-#define _RECT_H
+#ifndef RECT_H
+#define RECT_H

 #define ALIGN_HCENTER		0x00000000L
 #define ALIGN_LEFT			0x01000000L
--- a/core/core_include/resource.h
+++ b/core/core_include/resource.h
@ -1,5 +1,5 @@
-#ifndef  _RESOURCE_H_
-#define  _RESOURCE_H_
+#ifndef  RESOURCE_H
+#define  RESOURCE_H

 //BITMAP
 typedef struct struct_bitmap_info
--- a/core/core_include/surface.h
+++ b/core/core_include/surface.h
@ -1,5 +1,5 @@
-#ifndef _GAL_H_
-#define _GAL_H_
+#ifndef GAL_H
+#define GAL_H

 struct FRAME_LAYER
 {
--- a/core/core_include/wave_buffer.h
+++ b/core/core_include/wave_buffer.h
@ -1,5 +1,5 @@
-#ifndef _WAVE_BUFFER_H_
-#define _WAVE_BUFFER_H_
+#ifndef WAVE_BUFFER_H
+#define WAVE_BUFFER_H

 #define WAVE_BUFFER_LEN	1024
 #define WAVE_READ_CACHE_LEN	8
--- a/core/core_include/wave_ctrl.h
+++ b/core/core_include/wave_ctrl.h
@ -1,5 +1,5 @@
-#ifndef _WAVE_CTRL_H_
-#define _WAVE_CTRL_H_
+#ifndef WAVE_CTRL_H
+#define WAVE_CTRL_H

 typedef enum
 {
--- a/core/core_include/wnd.h
+++ b/core/core_include/wnd.h
@ -1,5 +1,5 @@
-#ifndef _GUI_WND_H_
-#define _GUI_WND_H_
+#ifndef GUI_WND_H
+#define GUI_WND_H

 //Window attribution
 #define GL_ATTR_VISIBLE		0x80000000L
--- a/core/core_include/word.h
+++ b/core/core_include/word.h
@ -1,5 +1,5 @@
-#ifndef _WORD_UNIT_H_
-#define _WORD_UNIT_H_
+#ifndef WORD_UNIT_H
+#define WORD_UNIT_H

 class c_surface;
 class c_word
--- a/gui/gui_include/button.h
+++ b/gui/gui_include/button.h
@ -1,5 +1,5 @@
-#ifndef _BUTTON_H_
-#define _BUTTON_H_
+#ifndef BUTTON_H
+#define BUTTON_H

 #define GL_BN_CLICKED							0x1111
 #define ON_GL_BN_CLICKED(ctrlId, func)                                       \
--- a/gui/gui_include/dialog.h
+++ b/gui/gui_include/dialog.h
@ -1,5 +1,5 @@
-#ifndef _DIALOG_H_
-#define _DIALOG_H_
+#ifndef DIALOG_H
+#define DIALOG_H

 class c_surface;
 class c_dialog;
--- a/gui/gui_include/edit.h
+++ b/gui/gui_include/edit.h
@ -1,5 +1,5 @@
-#ifndef _EDIT_H_
-#define _EDIT_H_
+#ifndef EDIT_H
+#define EDIT_H

 #define KEY_BOARD_STYLE    	0x00001000L
 #define NUM_BOARD_STYLE    	0x00002000L
--- a/gui/gui_include/gesture.h
+++ b/gui/gui_include/gesture.h
@ -1,5 +1,5 @@
-#ifndef _GESTURE_H_
-#define _GESTURE_H_
+#ifndef GESTURE_H
+#define GESTURE_H

 typedef enum{
 	TOUCH_MOVE,
--- a/gui/gui_include/keyboard.h
+++ b/gui/gui_include/keyboard.h
@ -1,5 +1,5 @@
-#ifndef _KEYBOARD_H_
-#define _KEYBOARD_H_
+#ifndef KEYBOARD_H
+#define KEYBOARD_H

 #define KEYBORAD_CLICK			0x5014
 #define ON_KEYBORAD_UPDATE(ctrlId, func)  \
--- a/gui/gui_include/label.h
+++ b/gui/gui_include/label.h
@ -1,5 +1,5 @@
-#ifndef _LABEL_H_
-#define _LABEL_H_
+#ifndef LABEL_H
+#define LABEL_H

 class c_label : public c_wnd
 {
--- a/gui/gui_include/list_box.h
+++ b/gui/gui_include/list_box.h
@ -1,5 +1,5 @@
-#ifndef _LIST_BOX_H_
-#define _LIST_BOX_H_
+#ifndef LIST_BOX_H
+#define LIST_BOX_H

 #define MAX_ITEM_NUM			12

--- a/gui/gui_include/my_resource.h
+++ b/gui/gui_include/my_resource.h
@ -1,5 +1,5 @@
-#ifndef _MY_RESOURCE_H_
-#define _MY_RESOURCE_H_
+#ifndef MY_RESOURCE_H
+#define MY_RESOURCE_H

 typedef struct struct_font_info		FONT_INFO;
 typedef struct struct_color_rect	COLOR_RECT;
--- a/gui/gui_include/slide_group.h
+++ b/gui/gui_include/slide_group.h
@ -1,5 +1,5 @@
-#ifndef PAGE_GROUP_H_
-#define PAGE_GROUP_H_
+#ifndef PAGE_GROUP_H
+#define PAGE_GROUP_H

 #define MAX_PAGES	5

--- a/gui/gui_include/spinbox.h
+++ b/gui/gui_include/spinbox.h
@ -1,5 +1,5 @@
-#ifndef _SPIN_BOX_H_
-#define _SPIN_BOX_H_
+#ifndef SPIN_BOX_H
+#define SPIN_BOX_H

 #define GL_SPIN_SELECT						0x2222
 #define GL_SPIN_CONFIRM					0x3333
--- a/gui/gui_include/table.h
+++ b/gui/gui_include/table.h
@ -1,5 +1,5 @@
-#ifndef _TABLE_H_
-#define  _TABLE_H_
+#ifndef TABLE_H
+#define TABLE_H

 #define  MAX_COL_NUM  30
 #define  MAX_ROW_NUM  30