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

diff --combined tests/test.bkl
index e6d35ee6fdac63adbf2ea259f5f7c9c1b20853d2,344abee419725f8eb38e4e38f8e4b3a4c6d5ec52..dd678d1a8a776a82a9af08ab296550cf3d90aee6
--- 1/tests/test.bkl
--- 2/tests/test.bkl
+++ b/tests/test.bkl
@@@ -147,6 -147,7 +147,7 @@@
              controls/choicebooktest.cpp
              controls/choicetest.cpp
              controls/comboboxtest.cpp
+             controls/dataviewctrltest.cpp
              controls/datepickerctrltest.cpp
              controls/frametest.cpp
              controls/gaugetest.cpp
@@@ -180,7 -181,6 +181,7 @@@
              controls/treebooktest.cpp
              controls/treectrltest.cpp
              controls/virtlistctrltest.cpp
 +            controls/webtest.cpp
              controls/windowtest.cpp
              events/clone.cpp
              events/propagation.cpp
@@@ -210,7 -210,6 +211,7 @@@
              window/setsize.cpp
              xml/xrctest.cpp
          </sources>
 +        <wx-lib>web</wx-lib>
          <wx-lib>richtext</wx-lib>
          <wx-lib>media</wx-lib>
          <wx-lib>xrc</wx-lib>