diff options
| author | [email protected] <[email protected]> | 2012-05-27 16:34:19 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-05-27 16:34:19 +0000 |
| commit | 87e992a574a6d22789930792bbeadec00b1fdb46 (patch) | |
| tree | e05f10c4fb776a631e143d84e4f31d896f49004d /components/rtgui/widgets/checkbox.c | |
| parent | f29989094cde5a672a2192e2141239c77c36e4cc (diff) | |
fix various bugs found by amsl
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2131 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/rtgui/widgets/checkbox.c')
| -rw-r--r-- | components/rtgui/widgets/checkbox.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/components/rtgui/widgets/checkbox.c b/components/rtgui/widgets/checkbox.c index 6a682903d0..cfa23d4ef4 100644 --- a/components/rtgui/widgets/checkbox.c +++ b/components/rtgui/widgets/checkbox.c @@ -16,7 +16,7 @@ static void _rtgui_checkbox_constructor(rtgui_checkbox_t *box) RTGUI_WIDGET_TEXTALIGN(RTGUI_WIDGET(box)) = RTGUI_ALIGN_LEFT | RTGUI_ALIGN_CENTER_VERTICAL; } -DEFINE_CLASS_TYPE(checkbox, "checkbox", +DEFINE_CLASS_TYPE(checkbox, "checkbox", RTGUI_LABEL_TYPE, _rtgui_checkbox_constructor, RT_NULL, @@ -31,13 +31,10 @@ void rtgui_checkbox_set_onbutton(rtgui_checkbox_t* checkbox, rtgui_onbutton_func rt_bool_t rtgui_checkbox_event_handler(struct rtgui_object* object, struct rtgui_event* event) { - struct rtgui_widget *widget; - struct rtgui_checkbox *box = (struct rtgui_checkbox*)widget; + struct rtgui_checkbox *box; - RT_ASSERT(widget != RT_NULL); - RT_ASSERT(event != RT_NULL); + RTGUI_WIDGET_EVENT_HANDLER_PREPARE - widget = RTGUI_WIDGET(object); box = RTGUI_CHECKBOX(object); switch (event->type) |