fix some compiling warning, errors in the new object system.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/components/rtgui/include/rtgui/rtgui_object.h b/components/rtgui/include/rtgui/rtgui_object.h
index 2010d9b403..20da0485b8 100644
--- a/components/rtgui/include/rtgui/rtgui_object.h
+++ b/components/rtgui/include/rtgui/rtgui_object.h
@@ -60,16 +60,16 @@ typedef struct rtgui_type rtgui_type_t;
 	const struct rtgui_type _rtgui_##type = { \

 	name, \

 	parent, \

-	constructor, \

-	destructor, \

+	RTGUI_CONSTRUCTOR(constructor), \

+	RTGUI_DESTRUCTOR(destructor), \

 	size }

 

-void          rtgui_type_object_construct(rtgui_type_t *type, rtgui_object_t *object);

-void          rtgui_type_destructors_call(rtgui_type_t *type, rtgui_object_t *object);

-rt_bool_t     rtgui_type_inherits_from(rtgui_type_t *type, rtgui_type_t *parent);

-rtgui_type_t  *rtgui_type_parent_type_get(rtgui_type_t *type);

-const char	  *rtgui_type_name_get(rtgui_type_t *type);

-rtgui_type_t  *rtgui_type_get_from_name(const char *name);

+void          rtgui_type_object_construct(const rtgui_type_t *type, rtgui_object_t *object);

+void          rtgui_type_destructors_call(const rtgui_type_t *type, rtgui_object_t *object);

+rt_bool_t     rtgui_type_inherits_from(const rtgui_type_t *type, const rtgui_type_t *parent);

+const rtgui_type_t  *rtgui_type_parent_type_get(const rtgui_type_t *type);

+const char	  *rtgui_type_name_get(const rtgui_type_t *type);

+const rtgui_type_t *rtgui_object_object_type_get(rtgui_object_t *object);
 

 #ifdef RTGUI_USING_CAST_CHECK

 	#define RTGUI_OBJECT_CAST(obj, obj_type, c_type) \