Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-12-26 01:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compiling warnings and errors ifndef RTGUI_USING_SMALL_SIZE

Browse Source 
Thank lgnq for pointing out it.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2096 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
chaos.proton@gmail.com
2012-04-20 06:47:38 +00:00
parent b05e37893a
commit df8bebdc55
15 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/rtgui/widgets/button.c
View File

@@ -95,7 +95,7 @@ rt_bool_t rtgui_button_event_handler(struct rtgui_object* object, struct rtgui_e
if ((btn->flag & RTGUI_BUTTON_FLAG_PRESS) && (btn->on_button != RT_NULL))
{
/* call on button handler */
btn->on_button(widget, event);
btn->on_button(RTGUI_OBJECT(widget), event);
}
}
}
@@ -137,14 +137,14 @@ rt_bool_t rtgui_button_event_handler(struct rtgui_object* object, struct rtgui_e
if (btn->on_button != RT_NULL)
{
/* call on button handler */
btn->on_button(widget, event);
btn->on_button(RTGUI_OBJECT(widget), event);
}
#ifndef RTGUI_USING_SMALL_SIZE
/* invokes call back */
if (widget->on_mouseclick != RT_NULL &&
emouse->button & RTGUI_MOUSE_BUTTON_UP)
return widget->on_mouseclick(widget, event);
return widget->on_mouseclick(RTGUI_OBJECT(widget), event);
#endif
}
}
@@ -175,13 +175,13 @@ rt_bool_t rtgui_button_event_handler(struct rtgui_object* object, struct rtgui_e
/* invokes call back */
if (widget->on_mouseclick != RT_NULL &&
emouse->button & RTGUI_MOUSE_BUTTON_UP)
return widget->on_mouseclick(widget, event);
return widget->on_mouseclick(RTGUI_OBJECT(widget), event);
#endif
if (!(btn->flag & RTGUI_BUTTON_FLAG_PRESS) && (btn->on_button != RT_NULL))
{
/* call on button handler */
btn->on_button(widget, event);
btn->on_button(RTGUI_OBJECT(widget), event);
}
}