Merge in from trunk r68684 - r69046

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --cc Makefile.in
Simple merge

diff --cc autoconf_inc.m4
Simple merge

diff --cc build/bakefiles/files.bkl
Simple merge

diff --cc build/msw/makefile.bcc
Simple merge

diff --cc build/msw/makefile.gcc
Simple merge

diff --cc build/msw/makefile.vc
Simple merge

diff --cc build/msw/makefile.wat
Simple merge

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc docs/doxygen/mainpages/const_wxusedef.h
Simple merge

diff --cc include/wx/compositewin.h
index 9e7b5fd6a1cca1d4c2260c11c19642d7fbf2b55f,9ac62639c2ace5804d40f7f28572d86bf6fa5b3b..1828de0979d3578f4666d2a3e596ce0b4ff0be9c
--- 1/include/wx/compositewin.h
--- 2/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@@ -3,7 -3,7 +3,7 @@@
  // Purpose:     wxCompositeWindow<> declaration
  // Author:      Vadim Zeitlin
  // Created:     2011-01-02
--// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
++// RCS-ID:      $Id$
  // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
  // Licence:     wxWindows licence
  ///////////////////////////////////////////////////////////////////////////////

diff --cc include/wx/msw/setup0.h
Simple merge

diff --cc include/wx/setup_inc.h
Simple merge

diff --cc samples/xrc/makefile.bcc
index 640ceb508d65ce1d76fdf87406a61cc79b26822c,fce255c64cee3bd3cb1859b45b8fb161cb2ad179..98b2e38818d03b19956cd6ff6fb562503bb711d2
--- 1/samples/xrc/makefile.bcc
--- 2/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@@ -256,7 -256,7 +256,7 @@@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS
  \r
  data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
 -      for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
++      for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
  \r
  $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc\r
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r

diff --cc samples/xrc/makefile.gcc
index c0fd8fd972436e2dbbbab281cf555c33fba9b69b,5da3226c0a03b42a6a52e5120a7b817bb7e547e8..8459b4b80ca42062aa663338bf7541053375852e
--- 1/samples/xrc/makefile.gcc
--- 2/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@@ -243,7 -243,7 +243,7 @@@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS
  \r
  data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc\r
 -      for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
++      for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc\r
  \r
  $(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc\r
        windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r

diff --cc samples/xrc/makefile.vc
index 8cf1f97d864ded94dea8fd59ee554d8c0b0029c5,3ca05cfbeb2cdae599c132bfe750875cb1888d4c..fde3fd3c77a620ed8a40783216b4ccd5f2e524c3
--- 1/samples/xrc/makefile.vc
--- 2/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@@ -366,7 -366,7 +366,7 @@@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS
  \r
  data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
 -      for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
++      for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
  \r
  $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc\r
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r

diff --cc samples/xrc/makefile.wat
index 6baceeba05bdcd3e64f034a4de040fe2d29ec200,9bcee4fd9fb09c8ddf110a422060103400c99953..d9ab7b2cdd9b2ef705536072169a21e03ecb5347
--- 1/samples/xrc/makefile.wat
--- 2/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@@ -286,7 -286,7 +286,7 @@@ $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECT
  \r
  data : .SYMBOLIC \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
 -      for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
++      for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
  \r
  $(OBJS)\xrcdemo_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
        wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r

diff --cc setup.h.in
Simple merge

diff --cc src/msw/anybutton.cpp
index 2603cdfdf32fa30ad5545baf3d412baf4bb361b6,a2382422e73f27d63fc23e6cccc35ed969586de0..db69814c48c04018ef7f759daca00a9f1f8d5709
--- 1/src/msw/anybutton.cpp
--- 2/src/msw/anybutton.cpp
+++ b/src/msw/anybutton.cpp
@@@ -3,7 -3,7 +3,7 @@@
  // Purpose:     wxAnyButton
  // Author:      Julian Smart
  // Created:     1998-01-04 (extracted from button.cpp)
--// RCS-ID:      $Id: anybutton.cpp 67384 2011-04-03 20:31:32Z DS $
++// RCS-ID:      $Id$
  // Copyright:   (c) Julian Smart
  // Licence:     wxWindows licence
  /////////////////////////////////////////////////////////////////////////////

diff --cc tests/Makefile.in
index c0e84f9606a1ea69f52bca653793d351aed79aaa,9c416fea22ea3b6a419e058d6f09647917223ae6..1fda4594c764c14d10b74aaeaea96274be55c28c
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -199,8 -199,8 +199,9 @@@ TEST_GUI_OBJECTS =  
        test_gui_toolbooktest.o \
        test_gui_treebooktest.o \
        test_gui_treectrltest.o \
+       test_gui_treelistctrltest.o \
        test_gui_virtlistctrltest.o \
 +      test_gui_webtest.o \
        test_gui_windowtest.o \
        test_gui_clone.o \
        test_gui_propagation.o \

diff --cc tests/makefile.bcc
index d7fed8b452584a0c592c8ce9f8cfd0a027b9b103,bf5afd974d8b69b01d8479954877398627ecf456..081c70a0cdb4fc6e06490af4f160e28c2c4a1541
--- 1/tests/makefile.bcc
--- 2/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@@ -184,8 -184,8 +184,9 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_toolbooktest.obj \\r
        $(OBJS)\test_gui_treebooktest.obj \\r
        $(OBJS)\test_gui_treectrltest.obj \\r
 -      $(OBJS)\test_gui_treelistctrltest.obj \
++      $(OBJS)\test_gui_treelistctrltest.obj \\r
        $(OBJS)\test_gui_virtlistctrltest.obj \\r
 +      $(OBJS)\test_gui_webtest.obj \\r
        $(OBJS)\test_gui_windowtest.obj \\r
        $(OBJS)\test_gui_clone.obj \\r
        $(OBJS)\test_gui_propagation.obj \\r
@@@ -885,6 -885,9 +890,9 @@@ $(OBJS)\test_gui_treebooktest.obj: .\co
  $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp\r
  \r
 -$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp
 -      $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp
 -
++$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp\r
++      $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp\r
++\r
  $(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp\r
  \r

diff --cc tests/makefile.gcc
index 3ec0462e0509c30d14303169fff306d1430ff415,a0803d9b4cda0f96c56a555016c1e802746dd6af..1498b6a970bab1b299c1e9e9f0f5fd11d30036e7
--- 1/tests/makefile.gcc
--- 2/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@@ -177,8 -177,8 +177,9 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_toolbooktest.o \\r
        $(OBJS)\test_gui_treebooktest.o \\r
        $(OBJS)\test_gui_treectrltest.o \\r
 -      $(OBJS)\test_gui_treelistctrltest.o \
++      $(OBJS)\test_gui_treelistctrltest.o \\r
        $(OBJS)\test_gui_virtlistctrltest.o \\r
 +      $(OBJS)\test_gui_webtest.o \\r
        $(OBJS)\test_gui_windowtest.o \\r
        $(OBJS)\test_gui_clone.o \\r
        $(OBJS)\test_gui_propagation.o \\r
@@@ -866,6 -866,9 +871,9 @@@ $(OBJS)\test_gui_treebooktest.o: ./cont
  $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
  \r
 -$(OBJS)\test_gui_treelistctrltest.o: ./controls/treelistctrltest.cpp
 -      $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 -
++$(OBJS)\test_gui_treelistctrltest.o: ./controls/treelistctrltest.cpp\r
++      $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
++\r
  $(OBJS)\test_gui_virtlistctrltest.o: ./controls/virtlistctrltest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
  \r

diff --cc tests/makefile.vc
index 0b0e551f7262374307179ce703ac41254ebb3d98,d0d4eb3efbae332abc37f31799812211bce6be48..0442379cb7ec712bcca474a7d0e25bbba42de516
--- 1/tests/makefile.vc
--- 2/tests/makefile.vc
+++ b/tests/makefile.vc
@@@ -179,8 -179,8 +179,9 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_toolbooktest.obj \\r
        $(OBJS)\test_gui_treebooktest.obj \\r
        $(OBJS)\test_gui_treectrltest.obj \\r
 -      $(OBJS)\test_gui_treelistctrltest.obj \
++      $(OBJS)\test_gui_treelistctrltest.obj \\r
        $(OBJS)\test_gui_virtlistctrltest.obj \\r
 +      $(OBJS)\test_gui_webtest.obj \\r
        $(OBJS)\test_gui_windowtest.obj \\r
        $(OBJS)\test_gui_clone.obj \\r
        $(OBJS)\test_gui_propagation.obj \\r
@@@ -1011,6 -1011,9 +1016,9 @@@ $(OBJS)\test_gui_treebooktest.obj: .\co
  $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp\r
  \r
 -$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp
 -      $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp
 -
++$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp\r
++      $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp\r
++\r
  $(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp\r
  \r

diff --cc tests/makefile.wat
index e9f5df1e177523f01604f5a9608e0d2d371f18da,4a6e44d1c5c7a01fcd6eb42a563dabfae6bb31d2..af16e37d8a743a6a17966dcd9ecfb41c051cbc49
--- 1/tests/makefile.wat
--- 2/tests/makefile.wat
+++ b/tests/makefile.wat
@@@ -428,8 -423,8 +428,9 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_toolbooktest.obj &\r
        $(OBJS)\test_gui_treebooktest.obj &\r
        $(OBJS)\test_gui_treectrltest.obj &\r
 -      $(OBJS)\test_gui_treelistctrltest.obj &
++      $(OBJS)\test_gui_treelistctrltest.obj &\r
        $(OBJS)\test_gui_virtlistctrltest.obj &\r
 +      $(OBJS)\test_gui_webtest.obj &\r
        $(OBJS)\test_gui_windowtest.obj &\r
        $(OBJS)\test_gui_clone.obj &\r
        $(OBJS)\test_gui_propagation.obj &\r
@@@ -925,7 -924,10 +930,10 @@@ $(OBJS)\test_gui_treebooktest.obj :  .A
  \r
  $(OBJS)\test_gui_treectrltest.obj :  .AUTODEPEND .\controls\treectrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 -$(OBJS)\test_gui_treelistctrltest.obj :  .AUTODEPEND .\controls\treelistctrltest.cpp
 -      $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 -
+ \r
++$(OBJS)\test_gui_treelistctrltest.obj :  .AUTODEPEND .\controls\treelistctrltest.cpp\r
++      $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 +\r
  $(OBJS)\test_gui_virtlistctrltest.obj :  .AUTODEPEND .\controls\virtlistctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
  \r

diff --cc tests/test.bkl
index a913c3487d74b43763618e7cc460ca903d159e41,75403f58ae291c0cf21c89c741fb10d699376747..a35147fddd442d44e4e7d657c587a76446c1d1f7
--- 1/tests/test.bkl
--- 2/tests/test.bkl
+++ b/tests/test.bkl
@@@ -180,8 -180,8 +180,9 @@@
              controls/toolbooktest.cpp
              controls/treebooktest.cpp
              controls/treectrltest.cpp
+             controls/treelistctrltest.cpp
              controls/virtlistctrltest.cpp
 +            controls/webtest.cpp
              controls/windowtest.cpp
              events/clone.cpp
              events/propagation.cpp

diff --cc tests/test_test_gui.dsp
index 612f85dcd063a69c0954787cadb0c3e17daba0da,50f7474723a7c0597e96613d0b0085494d08be6a..baeb86696cb6de0b976d713b867107a13e15abe7
--- 1/tests/test_test_gui.dsp
--- 2/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@@ -537,6 -537,10 +537,10 @@@ SOURCE=.\controls\treectrltest.cp
  # End Source File\r
  # Begin Source File\r
  \r
 -SOURCE=.\controls\treelistctrltest.cpp
 -# End Source File
 -# Begin Source File
 -
++SOURCE=.\controls\treelistctrltest.cpp\r
++# End Source File\r
++# Begin Source File\r
++\r
  SOURCE=.\validators\valnum.cpp\r
  # End Source File\r
  # Begin Source File\r

diff --cc tests/test_vc7_test_gui.vcproj
index 1903f7b596c0f2b2218bcbea73841979cff4a2c0,0147d16ee156824439048dbfd58c9e296a5d106b..e237709d403dff2c1e30d84c1f6f66020046a445
--- 1/tests/test_vc7_test_gui.vcproj
--- 2/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@@ -835,7 -835,10 +835,10 @@@
                        <File\r
                                RelativePath=".\controls\treectrltest.cpp">\r
                        </File>\r
 -                              RelativePath=".\controls\treelistctrltest.cpp">
 -                      </File>
 -                      <File
+                       <File\r
++                              RelativePath=".\controls\treelistctrltest.cpp">\r
++                      </File>\r
 +                      <File\r
                                RelativePath=".\validators\valnum.cpp">\r
                        </File>\r
                        <File\r

diff --cc tests/test_vc8_test_gui.vcproj
index 594059a065a85ebe16777b25a1f7d21de5eeb708,2cc1c40599a2ab15951e3026f26384afe4488f19..ad7842ee33fe46b2447fa4229f7d61e20b57afa6
--- 1/tests/test_vc8_test_gui.vcproj
--- 2/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@@ -1187,7 -1187,11 +1187,11 @@@
                                RelativePath=".\controls\treectrltest.cpp"\r
                                >\r
                        </File>\r
 -                              RelativePath=".\controls\treelistctrltest.cpp"
 -                              >
 -                      </File>
 -                      <File
+                       <File\r
++                              RelativePath=".\controls\treelistctrltest.cpp"\r
++                              >\r
++                      </File>\r
 +                      <File\r
                                RelativePath=".\validators\valnum.cpp"\r
                                >\r
                        </File>\r

diff --cc tests/test_vc9_test_gui.vcproj
index 0eca9044047afbdd5265c87616f2cb469776d634,ea56ae908dd1226265a153aff9b049e5dee502d3..2871094105f9568e9c9e0f7a4bda3bd6cce44645
--- 1/tests/test_vc9_test_gui.vcproj
--- 2/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@@ -1159,7 -1159,11 +1159,11 @@@
                                RelativePath=".\controls\treectrltest.cpp"\r
                                >\r
                        </File>\r
 -                              RelativePath=".\controls\treelistctrltest.cpp"
 -                              >
 -                      </File>
 -                      <File
+                       <File\r
++                              RelativePath=".\controls\treelistctrltest.cpp"\r
++                              >\r
++                      </File>\r
 +                      <File\r
                                RelativePath=".\validators\valnum.cpp"\r
                                >\r
                        </File>\r