chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update according to 0.3.1 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@686 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-05-02 12:26:19 +00:00
parent 030b39fad4
commit 16f7ea2f95
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/rtgui/server/server.c
View File

@ -456,12 +456,18 @@ void rtgui_server_handle_kbd(struct rtgui_event_kbd* event)
panel = rtgui_server_focus_panel; panel = rtgui_server_focus_panel;
if (panel != RT_NULL) if (panel != RT_NULL)
{ {
/* send to focus panel */ rt_thread_t tid;
event->wid = RT_NULL;
/* send keyboard event to thread */ /* get active thread in this panel */
rtgui_thread_send(rtgui_panel_get_active_thread(panel), tid = rtgui_panel_get_active_thread(panel);
(struct rtgui_event*)event, sizeof(struct rtgui_event_kbd)); if (tid != RT_NULL)
{
/* send to focus panel */
event->wid = RT_NULL;
/* send keyboard event to thread */
rtgui_thread_send(tid, (struct rtgui_event*)event, sizeof(struct rtgui_event_kbd));
}
} }
} }

7
components/rtgui/widgets/window.c
View File

@ -156,6 +156,11 @@ void rtgui_win_destroy(struct rtgui_win* win)
} }
} }
void rtgui_win_close(struct rtgui_win* win)
{
win->style |= RTGUI_WIN_STYLE_CLOSED;
}
rtgui_modal_code_t rtgui_win_show(struct rtgui_win* win, rt_bool_t is_modal) rtgui_modal_code_t rtgui_win_show(struct rtgui_win* win, rt_bool_t is_modal)
{ {
rtgui_modal_code_t result; rtgui_modal_code_t result;
@ -416,7 +421,7 @@ rt_bool_t rtgui_win_event_handler(struct rtgui_widget* widget, struct rtgui_even
if (widget->on_draw != RT_NULL) widget->on_draw(widget, event); if (widget->on_draw != RT_NULL) widget->on_draw(widget, event);
else else
#endif #endif
rtgui_win_ondraw(win); rtgui_widget_update(RTGUI_WIDGET(win));
if (win->on_activate != RT_NULL) if (win->on_activate != RT_NULL)
{ {