summaryrefslogtreecommitdiff
path: root/rtgui/widgets
diff options
context:
space:
mode:
authorbernard.xiong <[email protected]>2010-02-07 23:42:49 +0000
committerbernard.xiong <[email protected]>2010-02-07 23:42:49 +0000
commit6dac26e5b0b7f9dedcc94869bd3d3a4716e9b600 (patch)
tree23963bf188ce8f8288a25fc9286d618082186067 /rtgui/widgets
parentda603729c9e278f06250c7b3a86a95c62e51e2fd (diff)
remove more fields on window create.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@386 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui/widgets')
-rw-r--r--rtgui/widgets/toplevel.c15
-rw-r--r--rtgui/widgets/window.c8
2 files changed, 15 insertions, 8 deletions
diff --git a/rtgui/widgets/toplevel.c b/rtgui/widgets/toplevel.c
index cd4144b4c9..35284383ca 100644
--- a/rtgui/widgets/toplevel.c
+++ b/rtgui/widgets/toplevel.c
@@ -37,12 +37,13 @@ static void _rtgui_toplevel_constructor(rtgui_toplevel_t *toplevel)
static void _rtgui_toplevel_destructor(rtgui_toplevel_t* toplevel)
{
/* release external clip info */
- rtgui_free(toplevel->external_clip_rect);
-
toplevel->drawing = 0;
- rtgui_free(toplevel->external_clip_rect);
- toplevel->external_clip_rect = RT_NULL;
- toplevel->external_clip_size = 0;
+ if (toplevel->external_clip_size > 0)
+ {
+ rtgui_free(toplevel->external_clip_rect);
+ toplevel->external_clip_rect = RT_NULL;
+ toplevel->external_clip_size = 0;
+ }
}
rtgui_type_t *rtgui_toplevel_type_get(void)
@@ -115,6 +116,10 @@ rt_bool_t rtgui_toplevel_event_handler(rtgui_widget_t* widget, rtgui_event_t* ev
return RT_FALSE;
}
+#include <rtgui/widgets/window.h>
+#include <rtgui/widgets/workbench.h>
+#include <rtgui/widgets/title.h>
+
void rtgui_toplevel_handle_clip(struct rtgui_toplevel* top,
struct rtgui_event_clip_info* info)
{
diff --git a/rtgui/widgets/window.c b/rtgui/widgets/window.c
index 33b51126d4..1f6dfdcc34 100644
--- a/rtgui/widgets/window.c
+++ b/rtgui/widgets/window.c
@@ -77,10 +77,12 @@ static rt_bool_t _rtgui_win_create_in_server(rtgui_win_t* win)
}
/* send win create event to server */
- ecreate.wid = win;
- ecreate.extent = RTGUI_WIDGET(win)->extent;
- ecreate.flag = win->style;
+ ecreate.wid = win;
+ ecreate.parent.user = win->style;
+#ifndef RTGUI_USING_SMALL_SIZE
+ ecreate.extent = RTGUI_WIDGET(win)->extent;
rt_strncpy((char*)ecreate.title, (char*)win->title, RTGUI_NAME_MAX);
+#endif
if (rtgui_thread_send_sync(server, RTGUI_EVENT(&ecreate),
sizeof(struct rtgui_event_win_create)) != RT_EOK)