fix compiling warning.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@969 bbd45198-f89e-11dd-88c7-29a3b14d5316

3 files changed, 68 insertions, 67 deletions

diff --git a/components/rtgui/include/rtgui/blit.h b/components/rtgui/include/rtgui/blit.h
index 8be0b21949..615e5b6d7e 100644
--- a/components/rtgui/include/rtgui/blit.h
+++ b/components/rtgui/include/rtgui/blit.h
@@ -4,6 +4,6 @@
 #include <rtgui/rtgui.h>

 

 typedef void (*rtgui_blit_line_func)(rt_uint8_t* dst, rt_uint8_t* src, int line);

-const rtgui_blit_line_func rtgui_blit_line_get(int dst_bpp, int src_bpp);

+rtgui_blit_line_func rtgui_blit_line_get(int dst_bpp, int src_bpp);

 

 #endif

diff --git a/components/rtgui/include/rtgui/rtgui_system.h b/components/rtgui/include/rtgui/rtgui_system.h
index ef2bd5da84..4b963a3529 100644
--- a/components/rtgui/include/rtgui/rtgui_system.h
+++ b/components/rtgui/include/rtgui/rtgui_system.h
@@ -70,7 +70,7 @@ void rtgui_timer_stop (rtgui_timer_t* timer);
 rtgui_thread_t* rtgui_thread_register(rt_thread_t tid, rt_mq_t mq);

 void rtgui_thread_deregister(rt_thread_t tid);

 void rtgui_thread_set_onidle(rtgui_idle_func onidle);

-rtgui_idle_func rtgui_thread_get_onidle();

+rtgui_idle_func rtgui_thread_get_onidle(void);

 rtgui_thread_t* rtgui_thread_self(void);

 

 rt_thread_t rtgui_thread_get_server(void);

diff --git a/components/rtgui/include/rtgui/rtgui_theme.h b/components/rtgui/include/rtgui/rtgui_theme.h
index 1bbcfcdb04..27f09d0079 100644
--- a/components/rtgui/include/rtgui/rtgui_theme.h
+++ b/components/rtgui/include/rtgui/rtgui_theme.h
@@ -1,66 +1,67 @@
-/*

- * File      : rtgui_theme.h

- * This file is part of RTGUI in RT-Thread RTOS

- * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team

- *

- * The license and distribution terms for this file may be

- * found in the file LICENSE in this distribution or at

- * http://www.rt-thread.org/license/LICENSE

- *

- * Change Logs:

- * Date           Author       Notes

- * 2009-10-04     Bernard      first version

- */

-#ifndef __RTGUI_THEME_H__

-#define __RTGUI_THEME_H__

-

-#include <rtgui/rtgui.h>

-#include <rtgui/rtgui_server.h>

-

-#define CHECK_BOX_W		13

-#define CHECK_BOX_H		13

-

-#define RADIO_BOX_W		12

-#define RADIO_BOX_H		12

-

-#include <rtgui/widgets/label.h>

-#include <rtgui/widgets/button.h>

-#include <rtgui/widgets/textbox.h>

-#include <rtgui/widgets/iconbox.h>

-#include <rtgui/widgets/checkbox.h>

-#include <rtgui/widgets/radiobox.h>

-#include <rtgui/widgets/slider.h>

-#include <rtgui/widgets/scrollbar.h>

-#include <rtgui/widgets/progressbar.h>

-#include <rtgui/widgets/staticline.h>

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-void rtgui_system_theme_init(void);

-

-void rtgui_theme_draw_win(struct rtgui_topwin* win);

-void rtgui_theme_draw_button(rtgui_button_t* btn);

-void rtgui_theme_draw_label(rtgui_label_t* label);

-void rtgui_theme_draw_textbox(rtgui_textbox_t* box);

-void rtgui_theme_draw_iconbox(rtgui_iconbox_t* iconbox);

-void rtgui_theme_draw_checkbox(rtgui_checkbox_t* checkbox);

+/*
+ * File      : rtgui_theme.h
+ * This file is part of RTGUI in RT-Thread RTOS
+ * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2009-10-04     Bernard      first version
+ */
+#ifndef __RTGUI_THEME_H__
+#define __RTGUI_THEME_H__
+
+#include <rtgui/rtgui.h>
+#include <rtgui/rtgui_server.h>
+
+#define CHECK_BOX_W		13
+#define CHECK_BOX_H		13
+
+#define RADIO_BOX_W		12
+#define RADIO_BOX_H		12
+
+#include <rtgui/widgets/label.h>
+#include <rtgui/widgets/button.h>
+#include <rtgui/widgets/textbox.h>
+#include <rtgui/widgets/iconbox.h>
+#include <rtgui/widgets/checkbox.h>
+#include <rtgui/widgets/radiobox.h>
+#include <rtgui/widgets/slider.h>
+#include <rtgui/widgets/scrollbar.h>
+#include <rtgui/widgets/progressbar.h>
+#include <rtgui/widgets/staticline.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void rtgui_system_theme_init(void);
+
+void rtgui_theme_draw_win(struct rtgui_topwin* win);
+void rtgui_theme_draw_button(rtgui_button_t* btn);
+void rtgui_theme_draw_label(rtgui_label_t* label);
+void rtgui_theme_draw_textbox(rtgui_textbox_t* box);
+void rtgui_theme_draw_iconbox(rtgui_iconbox_t* iconbox);
+void rtgui_theme_draw_checkbox(rtgui_checkbox_t* checkbox);
 void rtgui_theme_draw_radiobutton(struct rtgui_radiobox* radiobox, rt_uint16_t item);
-void rtgui_theme_draw_radiobox(struct rtgui_radiobox* radiobox);

-void rtgui_theme_draw_slider(struct rtgui_slider* slider);

-void rtgui_theme_draw_scrollbar(struct rtgui_scrollbar* bar);

-void rtgui_theme_draw_progressbar(struct rtgui_progressbar* bar);

-void rtgui_theme_draw_staticline(struct rtgui_staticline* staticline);

-

-rt_uint16_t rtgui_theme_get_selected_height(void);

-void rtgui_theme_draw_selected(struct rtgui_dc* dc, rtgui_rect_t *rect);

-

-rtgui_color_t rtgui_theme_default_bc(void);

-rtgui_color_t rtgui_theme_default_fc(void);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

+
+void rtgui_theme_draw_radiobox(struct rtgui_radiobox* radiobox);
+void rtgui_theme_draw_slider(struct rtgui_slider* slider);
+void rtgui_theme_draw_scrollbar(struct rtgui_scrollbar* bar);
+void rtgui_theme_draw_progressbar(struct rtgui_progressbar* bar);
+void rtgui_theme_draw_staticline(struct rtgui_staticline* staticline);
+
+rt_uint16_t rtgui_theme_get_selected_height(void);
+void rtgui_theme_draw_selected(struct rtgui_dc* dc, rtgui_rect_t *rect);
+
+rtgui_color_t rtgui_theme_default_bc(void);
+rtgui_color_t rtgui_theme_default_fc(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif