libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove compiling warning. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@714 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-05-16 02:33:30 +00:00
parent 0cea283b5e
commit 0d5451c28f
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/rtgui/common/dc_hw.c
View File

@ -158,7 +158,7 @@ static rt_bool_t rtgui_dc_hw_fini(struct rtgui_dc* dc)
rtgui_toplevel_t* top = RTGUI_TOPLEVEL(hw->owner->toplevel);
top->drawing --;
if (top->drawing == 0)
if ((top->drawing == 0) && (hw->visible == RT_TRUE))
{
#ifdef __WIN32__
#ifdef RTGUI_USING_MOUSE_CURSOR
@ -186,7 +186,7 @@ static rt_bool_t rtgui_dc_hw_fini(struct rtgui_dc* dc)
rtgui_toplevel_t* top = RTGUI_TOPLEVEL(hw->owner->toplevel);
top->drawing --;
if (top->drawing == 0)
if ((top->drawing == 0) && (hw->visible == RT_TRUE))
{
#ifdef __WIN32__
#ifdef RTGUI_USING_MOUSE_CURSOR
@ -208,7 +208,6 @@ static rt_bool_t rtgui_dc_hw_fini(struct rtgui_dc* dc)
}
}
return RT_TRUE;
}

7
components/rtgui/common/rtgui_xml.c
View File

@ -1,4 +1,5 @@
#include <rtgui/rtgui_xml.h>
#include <rtgui/rtgui_system.h>
/* Internal states that the parser can be in at any given time. */
enum {
@ -173,22 +174,16 @@ const char* rtgui_xml_event_str(rt_uint8_t event)
{
case EVENT_START:
return "start tag";
break;
case EVENT_END:
return "end tag";
break;
case EVENT_TEXT:
return "text";
break;
case EVENT_NAME:
return "attr name";
break;
case EVENT_VAL:
return "attr val";
break;
case EVENT_END_DOC:
return "end document";
break;
default:
break;
}

2
components/rtgui/include/rtgui/widgets/checkbox.h
View File

@ -27,7 +27,7 @@ typedef struct rtgui_checkbox rtgui_checkbox_t;
rtgui_type_t *rtgui_checkbox_type_get(void);
rtgui_checkbox_t* rtgui_checkbox_create(unsigned char* text, rt_bool_t checked);
rtgui_checkbox_t* rtgui_checkbox_create(const char* text, rt_bool_t checked);
void rtgui_checkbox_destroy(rtgui_checkbox_t* checkbox);
void rtgui_checkbox_set_checked(rtgui_checkbox_t* checkbox, rt_bool_t checked);

2
components/rtgui/widgets/checkbox.c
View File

@ -87,7 +87,7 @@ rt_bool_t rtgui_checkbox_event_handler(struct rtgui_widget* widget, struct rtgui
return RT_FALSE;
}
struct rtgui_checkbox* rtgui_checkbox_create(unsigned char* text, rt_bool_t checked)
struct rtgui_checkbox* rtgui_checkbox_create(const char* text, rt_bool_t checked)
{
struct rtgui_checkbox* box;