fix compiling warnings and errors ifndef RTGUI_USING_SMALL_SIZE

Thank lgnq for pointing out it.

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

5 files changed, 5 insertions, 5 deletions

diff --git a/components/rtgui/include/rtgui/rtgui.h b/components/rtgui/include/rtgui/rtgui.h
index b473b9d794..d35e17ec5e 100644
--- a/components/rtgui/include/rtgui/rtgui.h
+++ b/components/rtgui/include/rtgui/rtgui.h
@@ -31,7 +31,7 @@ struct rtgui_font;
 typedef struct rtgui_win rtgui_win_t;
 typedef struct rtgui_workbench rtgui_workbench_t;
 typedef rt_bool_t (*rtgui_event_handler_ptr)(struct rtgui_object* widget, struct rtgui_event* event);
-typedef void (*rtgui_onbutton_func_t)(struct rtgui_widget* widget, struct rtgui_event* event);
+typedef void (*rtgui_onbutton_func_t)(struct rtgui_object* object, struct rtgui_event* event);
 
 struct rtgui_point
 {
diff --git a/components/rtgui/include/rtgui/rtgui_config.h b/components/rtgui/include/rtgui/rtgui_config.h
index f1dae17ca8..33ae2ee061 100644
--- a/components/rtgui/include/rtgui/rtgui_config.h
+++ b/components/rtgui/include/rtgui/rtgui_config.h
@@ -77,5 +77,5 @@
 //#define RTGUI_USING_DESKTOP_WINDOW
 
 #define  RTGUI_EVENT_DEBUG
-
+#undef RTGUI_USING_SMALL_SIZE
 #endif
diff --git a/components/rtgui/include/rtgui/widgets/box.h b/components/rtgui/include/rtgui/widgets/box.h
index 0e0b814e8b..370b9820d3 100644
--- a/components/rtgui/include/rtgui/widgets/box.h
+++ b/components/rtgui/include/rtgui/widgets/box.h
@@ -43,7 +43,7 @@ typedef struct rtgui_box rtgui_box_t;
 struct rtgui_box* rtgui_box_create(int orientation, rtgui_rect_t* rect);
 void rtgui_box_destroy(struct rtgui_box* box);
 
-rt_bool_t rtgui_box_event_handler(rtgui_widget_t* widget, rtgui_event_t* event);
+rt_bool_t rtgui_box_event_handler(struct rtgui_object* object, rtgui_event_t* event);
 
 void rtgui_box_append(rtgui_box_t* box, rtgui_widget_t* widget);
 void rtgui_box_layout(rtgui_box_t* box);
diff --git a/components/rtgui/include/rtgui/widgets/button.h b/components/rtgui/include/rtgui/widgets/button.h
index 0d7678d358..b149c5a2a2 100644
--- a/components/rtgui/include/rtgui/widgets/button.h
+++ b/components/rtgui/include/rtgui/widgets/button.h
@@ -57,7 +57,7 @@ struct rtgui_button
 	rtgui_image_t *pressed_image, *unpressed_image;
 
 	/* click button event handler */
-	void (*on_button)(struct rtgui_widget* widget, rtgui_event_t *event);
+	rtgui_onbutton_func_t on_button;
 };
 typedef struct rtgui_button rtgui_button_t;
 
diff --git a/components/rtgui/include/rtgui/widgets/checkbox.h b/components/rtgui/include/rtgui/widgets/checkbox.h
index bf226e061e..c23b5d79a1 100644
--- a/components/rtgui/include/rtgui/widgets/checkbox.h
+++ b/components/rtgui/include/rtgui/widgets/checkbox.h
@@ -26,7 +26,7 @@ struct rtgui_checkbox
 	rt_uint8_t status_down;
 
 	/* click button event handler */
-	void (*on_button)(struct rtgui_widget* widget, rtgui_event_t *event);
+	rtgui_onbutton_func_t on_button;
 };
 typedef struct rtgui_checkbox rtgui_checkbox_t;