sync RTGUI with github(https://github.com/RT-Thread/RTGUI) c4b8c0ac2a3de482357b88d584931831aed7c8ae

As always, full log is in GitHub.

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

3 files changed, 44 insertions, 49 deletions

diff --git a/components/rtgui/widgets/button.c b/components/rtgui/widgets/button.c
index 6f1f7984f3..ca15acb89a 100644
--- a/components/rtgui/widgets/button.c
+++ b/components/rtgui/widgets/button.c
@@ -156,10 +156,24 @@ rt_bool_t rtgui_button_event_handler(struct rtgui_object *object, struct rtgui_e
                 {
                     /* set the last mouse event handled widget */
                     struct rtgui_win *win;
+                    /* need callback */
+                    rt_bool_t need_cb = RT_FALSE;
 
                     win = RTGUI_WIN(RTGUI_WIDGET(btn)->toplevel);
                     win->last_mevent_widget = RTGUI_WIDGET(btn);
 
+                    /* we need to decide whether the callback will be invoked
+                     * before the flag has changed. Moreover, we cannot invoke
+                     * it directly here, because the button might be destroyed
+                     * in the callback. If that happens, program will crash on
+                     * the following code. We need to make sure that the
+                     * callbacks are invoke at the very last step. */
+                    if ((btn->flag & RTGUI_BUTTON_FLAG_PRESS)
+                        && (emouse->button & RTGUI_MOUSE_BUTTON_UP))
+                    {
+                        need_cb = RT_TRUE;
+                    }
+
                     /* it's a normal button */
                     if (emouse->button & RTGUI_MOUSE_BUTTON_DOWN)
                     {
@@ -173,20 +187,16 @@ rt_bool_t rtgui_button_event_handler(struct rtgui_object *object, struct rtgui_e
                     /* draw button */
                     rtgui_theme_draw_button(btn);
 
+                    if (need_cb)
+                    {
+                        if (btn->on_button)
+                            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(RTGUI_OBJECT(widget), event);
+                        if (widget->on_mouseclick)
+                            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(RTGUI_OBJECT(widget), event);
                     }
                 }
-
             }
 
             return RT_TRUE;
diff --git a/components/rtgui/widgets/listctrl.c b/components/rtgui/widgets/listctrl.c
index 8c6409c084..ee74bb2615 100644
--- a/components/rtgui/widgets/listctrl.c
+++ b/components/rtgui/widgets/listctrl.c
@@ -105,16 +105,18 @@ static void _rtgui_listctrl_scrollbar_onmouse(struct rtgui_listctrl *ctrl, struc
     if (mouse->y < rect.y1)
     {
         if (ctrl->current_item - ctrl->page_items >= 0)
-            ctrl->current_item -= ctrl->page_items;
-        rtgui_listctrl_update_current(ctrl, old_item);
+            rtgui_listctrl_set_current_item(ctrl, ctrl->current_item - ctrl->page_items);
+        else
+            rtgui_listctrl_update_current(ctrl, old_item);
     }
     else if (mouse->y > rect.y2)
     {
+        rt_uint16_t new_item;
         if (ctrl->current_item + ctrl->page_items < ctrl->items_count - 1)
-            ctrl->current_item += ctrl->page_items;
+            new_item = ctrl->current_item + ctrl->page_items;
         else
-            ctrl->current_item = ((ctrl->current_item / ctrl->page_items) + 1) * ctrl->page_items;
-        rtgui_listctrl_update_current(ctrl, old_item);
+            new_item = ((ctrl->current_item / ctrl->page_items) + 1) * ctrl->page_items;
+        rtgui_listctrl_set_current_item(ctrl, new_item);
     }
 }
 
@@ -166,7 +168,7 @@ static void _rtgui_listctrl_ondraw(struct rtgui_listctrl *ctrl)
     rtgui_dc_end_drawing(dc);
 }
 
-void rtgui_listctrl_update_current(struct rtgui_listctrl *ctrl, rt_uint16_t old_item)
+static void rtgui_listctrl_update_current(struct rtgui_listctrl *ctrl, rt_uint16_t old_item)
 {
     struct rtgui_dc *dc;
     rtgui_rect_t rect, item_rect;
@@ -214,7 +216,6 @@ void rtgui_listctrl_update_current(struct rtgui_listctrl *ctrl, rt_uint16_t old_
 
     rtgui_dc_end_drawing(dc);
 }
-RTM_EXPORT(rtgui_listctrl_update_current);
 
 rt_bool_t rtgui_listctrl_event_handler(struct rtgui_object *object, struct rtgui_event *event)
 {
@@ -288,24 +289,10 @@ rt_bool_t rtgui_listctrl_event_handler(struct rtgui_object *object, struct rtgui
             if ((index < ctrl->page_items) &&
                     (ctrl->current_item / ctrl->page_items)* ctrl->page_items + index < ctrl->items_count)
             {
-                rt_uint16_t old_item;
-
-                old_item = ctrl->current_item;
-
-                /* set selected item */
-                ctrl->current_item = (ctrl->current_item / ctrl->page_items) * ctrl->page_items + index;
                 if (emouse->button & RTGUI_MOUSE_BUTTON_DOWN)
                 {
-                    /* down event */
-                    rtgui_listctrl_update_current(ctrl, old_item);
-                }
-                else
-                {
-                    /* up event */
-                    if (ctrl->on_item != RT_NULL)
-                    {
-                        ctrl->on_item(RTGUI_OBJECT(ctrl), RT_NULL);
-                    }
+                    rtgui_listctrl_set_current_item(ctrl,
+                            (ctrl->current_item / ctrl->page_items) * ctrl->page_items + index);
                 }
             }
         }
@@ -318,38 +305,36 @@ rt_bool_t rtgui_listctrl_event_handler(struct rtgui_object *object, struct rtgui
         struct rtgui_event_kbd *ekbd = (struct rtgui_event_kbd *)event;
         if ((ekbd->type == RTGUI_KEYDOWN) && (ctrl->items_count > 0))
         {
-            rt_uint16_t old_item;
-
-            old_item = ctrl->current_item;
             switch (ekbd->key)
             {
             case RTGUIK_LEFT:
                 if (ctrl->current_item - ctrl->page_items >= 0)
-                    ctrl->current_item -= ctrl->page_items;
-                rtgui_listctrl_update_current(ctrl, old_item);
+                    rtgui_listctrl_set_current_item(ctrl, ctrl->current_item - ctrl->page_items);
                 return RT_TRUE;
 
             case RTGUIK_UP:
                 if (ctrl->current_item > 0)
-                    ctrl->current_item --;
-                rtgui_listctrl_update_current(ctrl, old_item);
+                    rtgui_listctrl_set_current_item(ctrl, ctrl->current_item-1);
                 return RT_TRUE;
 
             case RTGUIK_RIGHT:
-                if (ctrl->current_item + ctrl->page_items < ctrl->items_count - 1)
-                    ctrl->current_item += ctrl->page_items;
-                else
                 {
-                    if ((((ctrl->current_item / ctrl->page_items) + 1) * ctrl->page_items) < ctrl->items_count - 1)
-                        ctrl->current_item = ((ctrl->current_item / ctrl->page_items) + 1) * ctrl->page_items;
+                    rt_uint16_t new_item = ctrl->items_count;
+                    if (ctrl->current_item + ctrl->page_items < ctrl->items_count - 1)
+                        new_item = ctrl->current_item + ctrl->page_items;
+                    else
+                    {
+                        if ((((ctrl->current_item / ctrl->page_items) + 1) * ctrl->page_items)
+                                < ctrl->items_count - 1)
+                            new_item = ((ctrl->current_item / ctrl->page_items) + 1) * ctrl->page_items;
+                    }
+                    rtgui_listctrl_set_current_item(ctrl, new_item);
                 }
-                rtgui_listctrl_update_current(ctrl, old_item);
                 return RT_TRUE;
 
             case RTGUIK_DOWN:
                 if (ctrl->current_item < ctrl->items_count - 1)
-                    ctrl->current_item ++;
-                rtgui_listctrl_update_current(ctrl, old_item);
+                    rtgui_listctrl_set_current_item(ctrl, ctrl->current_item+1);
                 return RT_TRUE;
 
             case RTGUIK_RETURN:
diff --git a/components/rtgui/widgets/textbox.c b/components/rtgui/widgets/textbox.c
index 9dd2cafca2..53642aeed3 100644
--- a/components/rtgui/widgets/textbox.c
+++ b/components/rtgui/widgets/textbox.c
@@ -605,7 +605,7 @@ void rtgui_textbox_set_mask_char(rtgui_textbox_t *box, const char ch)
 	box->mask_char = ch;
 }
 
-const char rtgui_textbox_get_mask_char(rtgui_textbox_t *box)
+char rtgui_textbox_get_mask_char(rtgui_textbox_t *box)
 {
 	return box->mask_char;
 }