summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorbernard <[email protected]>2017-12-13 20:38:09 +0800
committerbernard <[email protected]>2017-12-13 20:38:09 +0800
commit3d28f8f512349d177acb7d62e3c704895de1cd37 (patch)
tree2c89c60d37ba6bf6caa6f88259ab4e35b407d60a /components
parent3802754f0517e96db8e73f6d789957b104400215 (diff)
[UIEngine] Fix compiling warning when build under Win32.
Diffstat (limited to 'components')
-rw-r--r--components/gui/include/rtgui/color.h6
-rw-r--r--components/gui/src/rtgui_app.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/components/gui/include/rtgui/color.h b/components/gui/include/rtgui/color.h
index cf6ef08623..f47189bd84 100644
--- a/components/gui/include/rtgui/color.h
+++ b/components/gui/include/rtgui/color.h
@@ -69,7 +69,11 @@ extern const rtgui_color_t default_background;
#define HIGH_LIGHT RTGUI_RGB(0xfc, 0xfc, 0xfc)
#define DARK_GREY RTGUI_RGB(0x7f, 0x7f, 0x7f)
#define LIGHT_GREY RTGUI_RGB(0xc0, 0xc0, 0xc0)
-#define TRANSPARENT RTGUI_ARGB(0, 0, 0, 0)
+
+#ifdef TRANSPARENT
+#undef TRANSPARENT
+#define TRANSPARENT 0
+#endif
extern const rtgui_color_t red;
extern const rtgui_color_t green;
diff --git a/components/gui/src/rtgui_app.c b/components/gui/src/rtgui_app.c
index 3488cbeced..9878ff4ea7 100644
--- a/components/gui/src/rtgui_app.c
+++ b/components/gui/src/rtgui_app.c
@@ -23,10 +23,13 @@
* 2012-07-07 Bernard move the send/recv message to the rtgui_system.c
*/
+#include <rthw.h>
+#include <rtthread.h>
+
#include <rtgui/rtgui_system.h>
#include <rtgui/rtgui_app.h>
#include <rtgui/widgets/window.h>
-#include <topwin.h>
+#include "topwin.h"
static void _rtgui_app_constructor(struct rtgui_app *app)
{