From db0646020812efc16ff0beebe35f9049dcc2bfed Mon Sep 17 00:00:00 2001
From: "chaos.proton@gmail.com" <chaos.proton@gmail.com>
Date: Wed, 18 Apr 2012 15:06:12 +0000
Subject: merge new RTGUI in to trunk

The full log is at https://github.com/RTGUI/RTGUI/commits/merge_1 and it's difficult to merge the new tree commit by commit. I also converted all the file into unix eol so there are many fake diff. Big changes are noted in rtgui/doc/road_map.txt and rtgui/doc/attention.txt. Keep an eye on them if you want to migrate your old code.

Note that the work is still in progress and the bsp is not prepared in trunk so far.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2092 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 examples/gui/SConscript | 86 ++++++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 40 deletions(-)

(limited to 'examples/gui/SConscript')

diff --git a/examples/gui/SConscript b/examples/gui/SConscript
index 55ad49d8a6..73d0f6731f 100644
--- a/examples/gui/SConscript
+++ b/examples/gui/SConscript
@@ -1,40 +1,46 @@
-from building import *
-
-src = Split("""
-demo_view_dc_buffer.c
-demo_view_instrument_panel.c
-demo_fnview.c
-demo_listview.c
-demo_listview_icon.c
-demo_panel_single.c
-demo_view.c
-demo_view_animation.c
-demo_view_buffer_animation.c
-demo_view_box.c
-demo_view_button.c
-demo_view_checkbox.c
-demo_view_dc.c
-demo_view_image.c
-demo_view_module.c
-demo_view_label.c
-demo_view_mywidget.c
-demo_view_progressbar.c
-demo_view_radiobox.c
-demo_view_listbox.c
-demo_view_slider.c
-demo_view_notebook.c
-demo_view_combobox.c
-demo_view_listctrl.c
-demo_view_menu.c
-demo_view_scrollbar.c
-demo_view_textbox.c
-demo_view_window.c
-demo_view_benchmark.c
-demo_workbench.c
-gui_init.c
-mywidget.c
-""")
-
-group = DefineGroup('gui_examples', src, depend = ['RT_USING_RTGUI'])
-
-Return('group')
+from building import *
+
+'''
+demo_view_dc_buffer.c
+demo_fnview.c
+demo_listview.c
+demo_listview_icon.c
+demo_panel_single.c
+demo_view_box.c
+demo_view_image.c
+demo_view_module.c
+'''
+
+src = Split("""
+demo_application.c
+demo_view.c
+demo_view_benchmark.c
+demo_view_dc.c
+demo_view_ttf.c
+demo_view_dc_buffer.c
+demo_view_animation.c
+demo_view_buffer_animation.c
+demo_view_instrument_panel.c
+demo_view_window.c
+demo_view_label.c
+demo_view_button.c
+demo_view_checkbox.c
+demo_view_progressbar.c
+demo_view_scrollbar.c
+demo_view_radiobox.c
+demo_view_textbox.c
+demo_view_listbox.c
+demo_view_menu.c
+demo_view_listctrl.c
+demo_view_combobox.c
+demo_view_slider.c
+demo_view_notebook.c
+demo_view_mywidget.c
+mywidget.c
+""")
+
+
+
+group = DefineGroup('gui_examples', src, depend = ['RT_USING_RTGUI'])
+
+Return('group')
-- 
cgit v1.3.1