Merge in from trunk r64802 - r68625

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 18:10:42 +00:00
parent 3baf235f60 cbef7338c1
commit 94e0018723
97 changed files with 2524 additions and 1712 deletions
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -147,6 +147,7 @@
            controls/choicebooktest.cpp
            controls/choicetest.cpp
            controls/comboboxtest.cpp
+            controls/dataviewctrltest.cpp
            controls/datepickerctrltest.cpp
            controls/frametest.cpp
            controls/gaugetest.cpp