Add a beginning of wxMenu unit test.

Test wxMenu and wxMenuBar item search and counting functions. See #12672. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:03:02 +00:00
parent 553d672896
commit 65571ec7bf
11 changed files with 1452 additions and 1147 deletions
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -200,6 +200,7 @@ TEST_GUI_OBJECTS =  \
 	test_gui_image.o \
 	test_gui_rawbmp.o \
 	test_gui_htmlwindow.o \
 	test_gui_menu.o \
 	test_gui_guifuncs.o \
 	test_gui_selstoretest.o \
 	test_gui_garbage.o \
@@ -820,6 +821,9 @@ test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP)
 test_gui_htmlwindow.o: $(srcdir)/html/htmlwindow.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/html/htmlwindow.cpp
 test_gui_menu.o: $(srcdir)/menu/menu.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/menu/menu.cpp
 test_gui_guifuncs.o: $(srcdir)/misc/guifuncs.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/guifuncs.cpp
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -129,9 +129,9 @@ TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_dummy.obj \
-	$(OBJS)\test_gui_asserthelper.obj \
+	$(OBJS)\test_gui_asserthelper.obj \
 	$(OBJS)\test_gui_test.obj \
-	$(OBJS)\test_gui_testableframe.obj \
+	$(OBJS)\test_gui_testableframe.obj \
 	$(OBJS)\test_gui_rect.obj \
 	$(OBJS)\test_gui_size.obj \
 	$(OBJS)\test_gui_point.obj \
@@ -140,51 +140,52 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_ellipsization.obj \
 	$(OBJS)\test_gui_measuring.obj \
 	$(OBJS)\test_gui_config.obj \
-	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
+	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
-	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
+	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
-	$(OBJS)\test_gui_bookctrlbasetest.obj \
+	$(OBJS)\test_gui_bookctrlbasetest.obj \
-	$(OBJS)\test_gui_buttontest.obj \
+	$(OBJS)\test_gui_buttontest.obj \
-	$(OBJS)\test_gui_checkboxtest.obj \
+	$(OBJS)\test_gui_checkboxtest.obj \
-	$(OBJS)\test_gui_checklistboxtest.obj \
+	$(OBJS)\test_gui_checklistboxtest.obj \
-	$(OBJS)\test_gui_choicebooktest.obj \
+	$(OBJS)\test_gui_choicebooktest.obj \
-	$(OBJS)\test_gui_choicetest.obj \
+	$(OBJS)\test_gui_choicetest.obj \
 	$(OBJS)\test_gui_comboboxtest.obj \
-	$(OBJS)\test_gui_frametest.obj \
+	$(OBJS)\test_gui_frametest.obj \
-	$(OBJS)\test_gui_gaugetest.obj \
+	$(OBJS)\test_gui_gaugetest.obj \
-	$(OBJS)\test_gui_gridtest.obj \
+	$(OBJS)\test_gui_gridtest.obj \
 	$(OBJS)\test_gui_headerctrltest.obj \
-	$(OBJS)\test_gui_hyperlinkctrltest.obj \
+	$(OBJS)\test_gui_hyperlinkctrltest.obj \
-	$(OBJS)\test_gui_itemcontainertest.obj \
+	$(OBJS)\test_gui_itemcontainertest.obj \
 	$(OBJS)\test_gui_label.obj \
-	$(OBJS)\test_gui_listbasetest.obj \
+	$(OBJS)\test_gui_listbasetest.obj \
-	$(OBJS)\test_gui_listbooktest.obj \
+	$(OBJS)\test_gui_listbooktest.obj \
-	$(OBJS)\test_gui_listboxtest.obj \
+	$(OBJS)\test_gui_listboxtest.obj \
 	$(OBJS)\test_gui_listctrltest.obj \
-	$(OBJS)\test_gui_listviewtest.obj \
+	$(OBJS)\test_gui_listviewtest.obj \
-	$(OBJS)\test_gui_notebooktest.obj \
+	$(OBJS)\test_gui_notebooktest.obj \
-	$(OBJS)\test_gui_pickerbasetest.obj \
+	$(OBJS)\test_gui_pickerbasetest.obj \
-	$(OBJS)\test_gui_pickertest.obj \
+	$(OBJS)\test_gui_pickertest.obj \
-	$(OBJS)\test_gui_radioboxtest.obj \
+	$(OBJS)\test_gui_radioboxtest.obj \
-	$(OBJS)\test_gui_radiobuttontest.obj \
+	$(OBJS)\test_gui_radiobuttontest.obj \
-	$(OBJS)\test_gui_rearrangelisttest.obj \
+	$(OBJS)\test_gui_rearrangelisttest.obj \
-	$(OBJS)\test_gui_richtextctrltest.obj \
+	$(OBJS)\test_gui_richtextctrltest.obj \
-	$(OBJS)\test_gui_slidertest.obj \
+	$(OBJS)\test_gui_slidertest.obj \
-	$(OBJS)\test_gui_spinctrldbltest.obj \
+	$(OBJS)\test_gui_spinctrldbltest.obj \
-	$(OBJS)\test_gui_spinctrltest.obj \
+	$(OBJS)\test_gui_spinctrltest.obj \
 	$(OBJS)\test_gui_textctrltest.obj \
 	$(OBJS)\test_gui_textentrytest.obj \
-	$(OBJS)\test_gui_togglebuttontest.obj \
+	$(OBJS)\test_gui_togglebuttontest.obj \
-	$(OBJS)\test_gui_toolbooktest.obj \
+	$(OBJS)\test_gui_toolbooktest.obj \
-	$(OBJS)\test_gui_treebooktest.obj \
+	$(OBJS)\test_gui_treebooktest.obj \
 	$(OBJS)\test_gui_treectrltest.obj \
-	$(OBJS)\test_gui_windowtest.obj \
+	$(OBJS)\test_gui_windowtest.obj \
 	$(OBJS)\test_gui_clone.obj \
 	$(OBJS)\test_gui_propagation.obj \
-	$(OBJS)\test_gui_keyboard.obj \
+	$(OBJS)\test_gui_keyboard.obj \
 	$(OBJS)\test_gui_fonttest.obj \
 	$(OBJS)\test_gui_image.obj \
 	$(OBJS)\test_gui_rawbmp.obj \
 	$(OBJS)\test_gui_htmlwindow.obj \
 	$(OBJS)\test_gui_menu.obj \
 	$(OBJS)\test_gui_guifuncs.obj \
 	$(OBJS)\test_gui_selstoretest.obj \
 	$(OBJS)\test_gui_garbage.obj \
@@ -192,8 +193,8 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_socket.obj \
 	$(OBJS)\test_gui_boxsizer.obj \
 	$(OBJS)\test_gui_clientsize.obj \
-	$(OBJS)\test_gui_setsize.obj \
+	$(OBJS)\test_gui_setsize.obj \
-	$(OBJS)\test_gui_xrctest.obj
+	$(OBJS)\test_gui_xrctest.obj
 ### Conditionally set variables: ###
@@ -263,10 +264,10 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_3 = -dWXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
+!if "$(MONOLITHIC)" == "0"
-__WXLIB_RICHTEXT_p = \
+__WXLIB_RICHTEXT_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
 __WXLIB_MEDIA_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
@@ -431,7 +432,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\test_gui_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res
+	c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res
 |
 !endif
@@ -698,15 +699,15 @@ $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
 $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp
-$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
+$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
-
+
 $(OBJS)\test_gui_test.obj: .\test.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
-$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
+$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
-
+
 $(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
@@ -731,129 +732,129 @@ $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
 $(OBJS)\test_gui_config.obj: .\config\config.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
-$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
+$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
-
+
-$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
+$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
-
+
-$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
+$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
-
+
-$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
+$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
-
+
-$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
+$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
-
+
-$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
+$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
-
+
-$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
+$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
-
+
-$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
+$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
-
+
 $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
-$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
+$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
-
+
-$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
+$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
-
+
-$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
+$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
-
+
 $(OBJS)\test_gui_headerctrltest.obj: .\controls\headerctrltest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\headerctrltest.cpp
-$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
+$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
-
+
-$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
+$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
-
+
 $(OBJS)\test_gui_label.obj: .\controls\label.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\label.cpp
-$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
+$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
-
+
-$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
+$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
-
+
-$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
+$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
-
+
 $(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listctrltest.cpp
-$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
+$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
-
+
-$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
+$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
-
+
-$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
+$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
-
+
-$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
+$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
-
+
-$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
+$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
-
+
-$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
+$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
-
+
-$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
+$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
-
+
-$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
+$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
-
+
-$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
+$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
-
+
-$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
+$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
-
+
-$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
+$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
-
+
 $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
 $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
-$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
+$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
-
+
-$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
+$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
-
+
-$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
+$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
-
+
 $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
-$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
+$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
-
+
 $(OBJS)\test_gui_clone.obj: .\events\clone.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
 $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
-$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
+$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
-
+
 $(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
@@ -866,6 +867,9 @@ $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
 $(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
 $(OBJS)\test_gui_menu.obj: .\menu\menu.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\menu\menu.cpp
 $(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
@@ -890,5 +894,6 @@ $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
 $(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
-$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
+$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -122,9 +122,9 @@ TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_sample_rc.o \
 	$(OBJS)\test_gui_dummy.o \
-	$(OBJS)\test_gui_asserthelper.o \
+	$(OBJS)\test_gui_asserthelper.o \
 	$(OBJS)\test_gui_test.o \
-	$(OBJS)\test_gui_testableframe.o \
+	$(OBJS)\test_gui_testableframe.o \
 	$(OBJS)\test_gui_rect.o \
 	$(OBJS)\test_gui_size.o \
 	$(OBJS)\test_gui_point.o \
@@ -133,51 +133,52 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_ellipsization.o \
 	$(OBJS)\test_gui_measuring.o \
 	$(OBJS)\test_gui_config.o \
-	$(OBJS)\test_gui_bitmapcomboboxtest.o \
+	$(OBJS)\test_gui_bitmapcomboboxtest.o \
-	$(OBJS)\test_gui_bitmaptogglebuttontest.o \
+	$(OBJS)\test_gui_bitmaptogglebuttontest.o \
-	$(OBJS)\test_gui_bookctrlbasetest.o \
+	$(OBJS)\test_gui_bookctrlbasetest.o \
-	$(OBJS)\test_gui_buttontest.o \
+	$(OBJS)\test_gui_buttontest.o \
-	$(OBJS)\test_gui_checkboxtest.o \
+	$(OBJS)\test_gui_checkboxtest.o \
-	$(OBJS)\test_gui_checklistboxtest.o \
+	$(OBJS)\test_gui_checklistboxtest.o \
-	$(OBJS)\test_gui_choicebooktest.o \
+	$(OBJS)\test_gui_choicebooktest.o \
-	$(OBJS)\test_gui_choicetest.o \
+	$(OBJS)\test_gui_choicetest.o \
 	$(OBJS)\test_gui_comboboxtest.o \
-	$(OBJS)\test_gui_frametest.o \
+	$(OBJS)\test_gui_frametest.o \
-	$(OBJS)\test_gui_gaugetest.o \
+	$(OBJS)\test_gui_gaugetest.o \
-	$(OBJS)\test_gui_gridtest.o \
+	$(OBJS)\test_gui_gridtest.o \
 	$(OBJS)\test_gui_headerctrltest.o \
-	$(OBJS)\test_gui_hyperlinkctrltest.o \
+	$(OBJS)\test_gui_hyperlinkctrltest.o \
-	$(OBJS)\test_gui_itemcontainertest.o \
+	$(OBJS)\test_gui_itemcontainertest.o \
 	$(OBJS)\test_gui_label.o \
-	$(OBJS)\test_gui_listbasetest.o \
+	$(OBJS)\test_gui_listbasetest.o \
-	$(OBJS)\test_gui_listbooktest.o \
+	$(OBJS)\test_gui_listbooktest.o \
-	$(OBJS)\test_gui_listboxtest.o \
+	$(OBJS)\test_gui_listboxtest.o \
 	$(OBJS)\test_gui_listctrltest.o \
-	$(OBJS)\test_gui_listviewtest.o \
+	$(OBJS)\test_gui_listviewtest.o \
-	$(OBJS)\test_gui_notebooktest.o \
+	$(OBJS)\test_gui_notebooktest.o \
-	$(OBJS)\test_gui_pickerbasetest.o \
+	$(OBJS)\test_gui_pickerbasetest.o \
-	$(OBJS)\test_gui_pickertest.o \
+	$(OBJS)\test_gui_pickertest.o \
-	$(OBJS)\test_gui_radioboxtest.o \
+	$(OBJS)\test_gui_radioboxtest.o \
-	$(OBJS)\test_gui_radiobuttontest.o \
+	$(OBJS)\test_gui_radiobuttontest.o \
-	$(OBJS)\test_gui_rearrangelisttest.o \
+	$(OBJS)\test_gui_rearrangelisttest.o \
-	$(OBJS)\test_gui_richtextctrltest.o \
+	$(OBJS)\test_gui_richtextctrltest.o \
-	$(OBJS)\test_gui_slidertest.o \
+	$(OBJS)\test_gui_slidertest.o \
-	$(OBJS)\test_gui_spinctrldbltest.o \
+	$(OBJS)\test_gui_spinctrldbltest.o \
-	$(OBJS)\test_gui_spinctrltest.o \
+	$(OBJS)\test_gui_spinctrltest.o \
 	$(OBJS)\test_gui_textctrltest.o \
 	$(OBJS)\test_gui_textentrytest.o \
-	$(OBJS)\test_gui_togglebuttontest.o \
+	$(OBJS)\test_gui_togglebuttontest.o \
-	$(OBJS)\test_gui_toolbooktest.o \
+	$(OBJS)\test_gui_toolbooktest.o \
-	$(OBJS)\test_gui_treebooktest.o \
+	$(OBJS)\test_gui_treebooktest.o \
 	$(OBJS)\test_gui_treectrltest.o \
-	$(OBJS)\test_gui_windowtest.o \
+	$(OBJS)\test_gui_windowtest.o \
 	$(OBJS)\test_gui_clone.o \
 	$(OBJS)\test_gui_propagation.o \
-	$(OBJS)\test_gui_keyboard.o \
+	$(OBJS)\test_gui_keyboard.o \
 	$(OBJS)\test_gui_fonttest.o \
 	$(OBJS)\test_gui_image.o \
 	$(OBJS)\test_gui_rawbmp.o \
 	$(OBJS)\test_gui_htmlwindow.o \
 	$(OBJS)\test_gui_menu.o \
 	$(OBJS)\test_gui_guifuncs.o \
 	$(OBJS)\test_gui_selstoretest.o \
 	$(OBJS)\test_gui_garbage.o \
@@ -185,8 +186,8 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_socket.o \
 	$(OBJS)\test_gui_boxsizer.o \
 	$(OBJS)\test_gui_clientsize.o \
-	$(OBJS)\test_gui_setsize.o \
+	$(OBJS)\test_gui_setsize.o \
-	$(OBJS)\test_gui_xrctest.o
+	$(OBJS)\test_gui_xrctest.o
 ### Conditionally set variables: ###
@@ -260,10 +261,10 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
-__WXLIB_RICHTEXT_p = \
+__WXLIB_RICHTEXT_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
-endif
+endif
-ifeq ($(MONOLITHIC),0)
+ifeq ($(MONOLITHIC),0)
 ifeq ($(USE_MEDIA),1)
 __WXLIB_MEDIA_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media
@@ -413,7 +414,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS)
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
-	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
 endif
 data: 
@@ -679,15 +680,15 @@ $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
 $(OBJS)\test_gui_dummy.o: ./dummy.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_asserthelper.o: ./asserthelper.cpp
+$(OBJS)\test_gui_asserthelper.o: ./asserthelper.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_test.o: ./test.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_testableframe.o: ./testableframe.cpp
+$(OBJS)\test_gui_testableframe.o: ./testableframe.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_rect.o: ./geometry/rect.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
@@ -712,129 +713,129 @@ $(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp
 $(OBJS)\test_gui_config.o: ./config/config.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_bitmapcomboboxtest.o: ./controls/bitmapcomboboxtest.cpp
+$(OBJS)\test_gui_bitmapcomboboxtest.o: ./controls/bitmapcomboboxtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_bitmaptogglebuttontest.o: ./controls/bitmaptogglebuttontest.cpp
+$(OBJS)\test_gui_bitmaptogglebuttontest.o: ./controls/bitmaptogglebuttontest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_bookctrlbasetest.o: ./controls/bookctrlbasetest.cpp
+$(OBJS)\test_gui_bookctrlbasetest.o: ./controls/bookctrlbasetest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_buttontest.o: ./controls/buttontest.cpp
+$(OBJS)\test_gui_buttontest.o: ./controls/buttontest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_checkboxtest.o: ./controls/checkboxtest.cpp
+$(OBJS)\test_gui_checkboxtest.o: ./controls/checkboxtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_checklistboxtest.o: ./controls/checklistboxtest.cpp
+$(OBJS)\test_gui_checklistboxtest.o: ./controls/checklistboxtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_choicebooktest.o: ./controls/choicebooktest.cpp
+$(OBJS)\test_gui_choicebooktest.o: ./controls/choicebooktest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_choicetest.o: ./controls/choicetest.cpp
+$(OBJS)\test_gui_choicetest.o: ./controls/choicetest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_comboboxtest.o: ./controls/comboboxtest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_frametest.o: ./controls/frametest.cpp
+$(OBJS)\test_gui_frametest.o: ./controls/frametest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_gaugetest.o: ./controls/gaugetest.cpp
+$(OBJS)\test_gui_gaugetest.o: ./controls/gaugetest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_gridtest.o: ./controls/gridtest.cpp
+$(OBJS)\test_gui_gridtest.o: ./controls/gridtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_headerctrltest.o: ./controls/headerctrltest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_hyperlinkctrltest.o: ./controls/hyperlinkctrltest.cpp
+$(OBJS)\test_gui_hyperlinkctrltest.o: ./controls/hyperlinkctrltest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_itemcontainertest.o: ./controls/itemcontainertest.cpp
+$(OBJS)\test_gui_itemcontainertest.o: ./controls/itemcontainertest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_label.o: ./controls/label.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_listbasetest.o: ./controls/listbasetest.cpp
+$(OBJS)\test_gui_listbasetest.o: ./controls/listbasetest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_listbooktest.o: ./controls/listbooktest.cpp
+$(OBJS)\test_gui_listbooktest.o: ./controls/listbooktest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_listboxtest.o: ./controls/listboxtest.cpp
+$(OBJS)\test_gui_listboxtest.o: ./controls/listboxtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_listctrltest.o: ./controls/listctrltest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_listviewtest.o: ./controls/listviewtest.cpp
+$(OBJS)\test_gui_listviewtest.o: ./controls/listviewtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_notebooktest.o: ./controls/notebooktest.cpp
+$(OBJS)\test_gui_notebooktest.o: ./controls/notebooktest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_pickerbasetest.o: ./controls/pickerbasetest.cpp
+$(OBJS)\test_gui_pickerbasetest.o: ./controls/pickerbasetest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_pickertest.o: ./controls/pickertest.cpp
+$(OBJS)\test_gui_pickertest.o: ./controls/pickertest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_radioboxtest.o: ./controls/radioboxtest.cpp
+$(OBJS)\test_gui_radioboxtest.o: ./controls/radioboxtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_radiobuttontest.o: ./controls/radiobuttontest.cpp
+$(OBJS)\test_gui_radiobuttontest.o: ./controls/radiobuttontest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_rearrangelisttest.o: ./controls/rearrangelisttest.cpp
+$(OBJS)\test_gui_rearrangelisttest.o: ./controls/rearrangelisttest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_richtextctrltest.o: ./controls/richtextctrltest.cpp
+$(OBJS)\test_gui_richtextctrltest.o: ./controls/richtextctrltest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_slidertest.o: ./controls/slidertest.cpp
+$(OBJS)\test_gui_slidertest.o: ./controls/slidertest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_spinctrldbltest.o: ./controls/spinctrldbltest.cpp
+$(OBJS)\test_gui_spinctrldbltest.o: ./controls/spinctrldbltest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_spinctrltest.o: ./controls/spinctrltest.cpp
+$(OBJS)\test_gui_spinctrltest.o: ./controls/spinctrltest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_textctrltest.o: ./controls/textctrltest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_togglebuttontest.o: ./controls/togglebuttontest.cpp
+$(OBJS)\test_gui_togglebuttontest.o: ./controls/togglebuttontest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_toolbooktest.o: ./controls/toolbooktest.cpp
+$(OBJS)\test_gui_toolbooktest.o: ./controls/toolbooktest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
-$(OBJS)\test_gui_treebooktest.o: ./controls/treebooktest.cpp
+$(OBJS)\test_gui_treebooktest.o: ./controls/treebooktest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_windowtest.o: ./controls/windowtest.cpp
+$(OBJS)\test_gui_windowtest.o: ./controls/windowtest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_clone.o: ./events/clone.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_keyboard.o: ./events/keyboard.cpp
+$(OBJS)\test_gui_keyboard.o: ./events/keyboard.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 $(OBJS)\test_gui_fonttest.o: ./font/fonttest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
@@ -847,6 +848,9 @@ $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
 $(OBJS)\test_gui_htmlwindow.o: ./html/htmlwindow.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\test_gui_menu.o: ./menu/menu.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\test_gui_guifuncs.o: ./misc/guifuncs.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
@@ -871,9 +875,9 @@ $(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp
 $(OBJS)\test_gui_setsize.o: ./window/setsize.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp
+$(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+
 .PHONY: all clean data fr
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -124,9 +124,9 @@ TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
 	/Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_dummy.obj \
-	$(OBJS)\test_gui_asserthelper.obj \
+	$(OBJS)\test_gui_asserthelper.obj \
 	$(OBJS)\test_gui_test.obj \
-	$(OBJS)\test_gui_testableframe.obj \
+	$(OBJS)\test_gui_testableframe.obj \
 	$(OBJS)\test_gui_rect.obj \
 	$(OBJS)\test_gui_size.obj \
 	$(OBJS)\test_gui_point.obj \
@@ -135,51 +135,52 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_ellipsization.obj \
 	$(OBJS)\test_gui_measuring.obj \
 	$(OBJS)\test_gui_config.obj \
-	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
+	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
-	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
+	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
-	$(OBJS)\test_gui_bookctrlbasetest.obj \
+	$(OBJS)\test_gui_bookctrlbasetest.obj \
-	$(OBJS)\test_gui_buttontest.obj \
+	$(OBJS)\test_gui_buttontest.obj \
-	$(OBJS)\test_gui_checkboxtest.obj \
+	$(OBJS)\test_gui_checkboxtest.obj \
-	$(OBJS)\test_gui_checklistboxtest.obj \
+	$(OBJS)\test_gui_checklistboxtest.obj \
-	$(OBJS)\test_gui_choicebooktest.obj \
+	$(OBJS)\test_gui_choicebooktest.obj \
-	$(OBJS)\test_gui_choicetest.obj \
+	$(OBJS)\test_gui_choicetest.obj \
 	$(OBJS)\test_gui_comboboxtest.obj \
-	$(OBJS)\test_gui_frametest.obj \
+	$(OBJS)\test_gui_frametest.obj \
-	$(OBJS)\test_gui_gaugetest.obj \
+	$(OBJS)\test_gui_gaugetest.obj \
-	$(OBJS)\test_gui_gridtest.obj \
+	$(OBJS)\test_gui_gridtest.obj \
 	$(OBJS)\test_gui_headerctrltest.obj \
-	$(OBJS)\test_gui_hyperlinkctrltest.obj \
+	$(OBJS)\test_gui_hyperlinkctrltest.obj \
-	$(OBJS)\test_gui_itemcontainertest.obj \
+	$(OBJS)\test_gui_itemcontainertest.obj \
 	$(OBJS)\test_gui_label.obj \
-	$(OBJS)\test_gui_listbasetest.obj \
+	$(OBJS)\test_gui_listbasetest.obj \
-	$(OBJS)\test_gui_listbooktest.obj \
+	$(OBJS)\test_gui_listbooktest.obj \
-	$(OBJS)\test_gui_listboxtest.obj \
+	$(OBJS)\test_gui_listboxtest.obj \
 	$(OBJS)\test_gui_listctrltest.obj \
-	$(OBJS)\test_gui_listviewtest.obj \
+	$(OBJS)\test_gui_listviewtest.obj \
-	$(OBJS)\test_gui_notebooktest.obj \
+	$(OBJS)\test_gui_notebooktest.obj \
-	$(OBJS)\test_gui_pickerbasetest.obj \
+	$(OBJS)\test_gui_pickerbasetest.obj \
-	$(OBJS)\test_gui_pickertest.obj \
+	$(OBJS)\test_gui_pickertest.obj \
-	$(OBJS)\test_gui_radioboxtest.obj \
+	$(OBJS)\test_gui_radioboxtest.obj \
-	$(OBJS)\test_gui_radiobuttontest.obj \
+	$(OBJS)\test_gui_radiobuttontest.obj \
-	$(OBJS)\test_gui_rearrangelisttest.obj \
+	$(OBJS)\test_gui_rearrangelisttest.obj \
-	$(OBJS)\test_gui_richtextctrltest.obj \
+	$(OBJS)\test_gui_richtextctrltest.obj \
-	$(OBJS)\test_gui_slidertest.obj \
+	$(OBJS)\test_gui_slidertest.obj \
-	$(OBJS)\test_gui_spinctrldbltest.obj \
+	$(OBJS)\test_gui_spinctrldbltest.obj \
-	$(OBJS)\test_gui_spinctrltest.obj \
+	$(OBJS)\test_gui_spinctrltest.obj \
 	$(OBJS)\test_gui_textctrltest.obj \
 	$(OBJS)\test_gui_textentrytest.obj \
-	$(OBJS)\test_gui_togglebuttontest.obj \
+	$(OBJS)\test_gui_togglebuttontest.obj \
-	$(OBJS)\test_gui_toolbooktest.obj \
+	$(OBJS)\test_gui_toolbooktest.obj \
-	$(OBJS)\test_gui_treebooktest.obj \
+	$(OBJS)\test_gui_treebooktest.obj \
 	$(OBJS)\test_gui_treectrltest.obj \
-	$(OBJS)\test_gui_windowtest.obj \
+	$(OBJS)\test_gui_windowtest.obj \
 	$(OBJS)\test_gui_clone.obj \
 	$(OBJS)\test_gui_propagation.obj \
-	$(OBJS)\test_gui_keyboard.obj \
+	$(OBJS)\test_gui_keyboard.obj \
 	$(OBJS)\test_gui_fonttest.obj \
 	$(OBJS)\test_gui_image.obj \
 	$(OBJS)\test_gui_rawbmp.obj \
 	$(OBJS)\test_gui_htmlwindow.obj \
 	$(OBJS)\test_gui_menu.obj \
 	$(OBJS)\test_gui_guifuncs.obj \
 	$(OBJS)\test_gui_selstoretest.obj \
 	$(OBJS)\test_gui_garbage.obj \
@@ -187,8 +188,8 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_socket.obj \
 	$(OBJS)\test_gui_boxsizer.obj \
 	$(OBJS)\test_gui_clientsize.obj \
-	$(OBJS)\test_gui_setsize.obj \
+	$(OBJS)\test_gui_setsize.obj \
-	$(OBJS)\test_gui_xrctest.obj
+	$(OBJS)\test_gui_xrctest.obj
 TEST_GUI_RESOURCES =  \
 	$(OBJS)\test_gui_sample.res
@@ -344,10 +345,10 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_3 = /d WXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
+!if "$(MONOLITHIC)" == "0"
-__WXLIB_RICHTEXT_p = \
+__WXLIB_RICHTEXT_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
 __WXLIB_MEDIA_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
@@ -557,7 +558,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_19)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+	$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
 <<
 !endif
@@ -824,15 +825,15 @@ $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
 $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_20_p_1) $(__NO_VC_CRTDBG_p_3)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc
-$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
+$(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
-
+
 $(OBJS)\test_gui_test.obj: .\test.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
-$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
+$(OBJS)\test_gui_testableframe.obj: .\testableframe.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
-
+
 $(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
@@ -857,129 +858,129 @@ $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
 $(OBJS)\test_gui_config.obj: .\config\config.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
-$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
+$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
-
+
-$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
+$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
-
+
-$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
+$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
-
+
-$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
+$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
-
+
-$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
+$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
-
+
-$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
+$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
-
+
-$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
+$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
-
+
-$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
+$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
-
+
 $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
-$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
+$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
-
+
-$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
+$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
-
+
-$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
+$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
-
+
 $(OBJS)\test_gui_headerctrltest.obj: .\controls\headerctrltest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\headerctrltest.cpp
-$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
+$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
-
+
-$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
+$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
-
+
 $(OBJS)\test_gui_label.obj: .\controls\label.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\label.cpp
-$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
+$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
-
+
-$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
+$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
-
+
-$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
+$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
-
+
 $(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listctrltest.cpp
-$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
+$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
-
+
-$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
+$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
-
+
-$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
+$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
-
+
-$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
+$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
-
+
-$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
+$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
-
+
-$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
+$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
-
+
-$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
+$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
-
+
-$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
+$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
-
+
-$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
+$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
-
+
-$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
+$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
-
+
-$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
+$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
-
+
 $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
 $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
-$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
+$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
-
+
-$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
+$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
-
+
-$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
+$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
-
+
 $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
-$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
+$(OBJS)\test_gui_windowtest.obj: .\controls\windowtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
-
+
 $(OBJS)\test_gui_clone.obj: .\events\clone.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
 $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
-$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
+$(OBJS)\test_gui_keyboard.obj: .\events\keyboard.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
-
+
 $(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
@@ -992,6 +993,9 @@ $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
 $(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
 $(OBJS)\test_gui_menu.obj: .\menu\menu.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\menu\menu.cpp
 $(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
@@ -1016,5 +1020,6 @@ $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
 $(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
-$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
+$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -72,11 +72,11 @@ __test_gui___depname =
 !ifeq USE_GUI 1
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif
-__WXLIB_RICHTEXT_p =
+__WXLIB_RICHTEXT_p =
-!ifeq MONOLITHIC 0
+!ifeq MONOLITHIC 0
-__WXLIB_RICHTEXT_p = &
+__WXLIB_RICHTEXT_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
+!endif
 __WXLIB_MEDIA_p =
 !ifeq MONOLITHIC 0
 !ifeq USE_MEDIA 1
@@ -364,9 +364,9 @@ TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_dummy.obj &
-	$(OBJS)\test_gui_asserthelper.obj &
+	$(OBJS)\test_gui_asserthelper.obj &
 	$(OBJS)\test_gui_test.obj &
-	$(OBJS)\test_gui_testableframe.obj &
+	$(OBJS)\test_gui_testableframe.obj &
 	$(OBJS)\test_gui_rect.obj &
 	$(OBJS)\test_gui_size.obj &
 	$(OBJS)\test_gui_point.obj &
@@ -375,51 +375,52 @@ TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_ellipsization.obj &
 	$(OBJS)\test_gui_measuring.obj &
 	$(OBJS)\test_gui_config.obj &
-	$(OBJS)\test_gui_bitmapcomboboxtest.obj &
+	$(OBJS)\test_gui_bitmapcomboboxtest.obj &
-	$(OBJS)\test_gui_bitmaptogglebuttontest.obj &
+	$(OBJS)\test_gui_bitmaptogglebuttontest.obj &
-	$(OBJS)\test_gui_bookctrlbasetest.obj &
+	$(OBJS)\test_gui_bookctrlbasetest.obj &
-	$(OBJS)\test_gui_buttontest.obj &
+	$(OBJS)\test_gui_buttontest.obj &
-	$(OBJS)\test_gui_checkboxtest.obj &
+	$(OBJS)\test_gui_checkboxtest.obj &
-	$(OBJS)\test_gui_checklistboxtest.obj &
+	$(OBJS)\test_gui_checklistboxtest.obj &
-	$(OBJS)\test_gui_choicebooktest.obj &
+	$(OBJS)\test_gui_choicebooktest.obj &
-	$(OBJS)\test_gui_choicetest.obj &
+	$(OBJS)\test_gui_choicetest.obj &
 	$(OBJS)\test_gui_comboboxtest.obj &
-	$(OBJS)\test_gui_frametest.obj &
+	$(OBJS)\test_gui_frametest.obj &
-	$(OBJS)\test_gui_gaugetest.obj &
+	$(OBJS)\test_gui_gaugetest.obj &
-	$(OBJS)\test_gui_gridtest.obj &
+	$(OBJS)\test_gui_gridtest.obj &
 	$(OBJS)\test_gui_headerctrltest.obj &
-	$(OBJS)\test_gui_hyperlinkctrltest.obj &
+	$(OBJS)\test_gui_hyperlinkctrltest.obj &
-	$(OBJS)\test_gui_itemcontainertest.obj &
+	$(OBJS)\test_gui_itemcontainertest.obj &
 	$(OBJS)\test_gui_label.obj &
-	$(OBJS)\test_gui_listbasetest.obj &
+	$(OBJS)\test_gui_listbasetest.obj &
-	$(OBJS)\test_gui_listbooktest.obj &
+	$(OBJS)\test_gui_listbooktest.obj &
-	$(OBJS)\test_gui_listboxtest.obj &
+	$(OBJS)\test_gui_listboxtest.obj &
 	$(OBJS)\test_gui_listctrltest.obj &
-	$(OBJS)\test_gui_listviewtest.obj &
+	$(OBJS)\test_gui_listviewtest.obj &
-	$(OBJS)\test_gui_notebooktest.obj &
+	$(OBJS)\test_gui_notebooktest.obj &
-	$(OBJS)\test_gui_pickerbasetest.obj &
+	$(OBJS)\test_gui_pickerbasetest.obj &
-	$(OBJS)\test_gui_pickertest.obj &
+	$(OBJS)\test_gui_pickertest.obj &
-	$(OBJS)\test_gui_radioboxtest.obj &
+	$(OBJS)\test_gui_radioboxtest.obj &
-	$(OBJS)\test_gui_radiobuttontest.obj &
+	$(OBJS)\test_gui_radiobuttontest.obj &
-	$(OBJS)\test_gui_rearrangelisttest.obj &
+	$(OBJS)\test_gui_rearrangelisttest.obj &
-	$(OBJS)\test_gui_richtextctrltest.obj &
+	$(OBJS)\test_gui_richtextctrltest.obj &
-	$(OBJS)\test_gui_slidertest.obj &
+	$(OBJS)\test_gui_slidertest.obj &
-	$(OBJS)\test_gui_spinctrldbltest.obj &
+	$(OBJS)\test_gui_spinctrldbltest.obj &
-	$(OBJS)\test_gui_spinctrltest.obj &
+	$(OBJS)\test_gui_spinctrltest.obj &
 	$(OBJS)\test_gui_textctrltest.obj &
 	$(OBJS)\test_gui_textentrytest.obj &
-	$(OBJS)\test_gui_togglebuttontest.obj &
+	$(OBJS)\test_gui_togglebuttontest.obj &
-	$(OBJS)\test_gui_toolbooktest.obj &
+	$(OBJS)\test_gui_toolbooktest.obj &
-	$(OBJS)\test_gui_treebooktest.obj &
+	$(OBJS)\test_gui_treebooktest.obj &
 	$(OBJS)\test_gui_treectrltest.obj &
-	$(OBJS)\test_gui_windowtest.obj &
+	$(OBJS)\test_gui_windowtest.obj &
 	$(OBJS)\test_gui_clone.obj &
 	$(OBJS)\test_gui_propagation.obj &
-	$(OBJS)\test_gui_keyboard.obj &
+	$(OBJS)\test_gui_keyboard.obj &
 	$(OBJS)\test_gui_fonttest.obj &
 	$(OBJS)\test_gui_image.obj &
 	$(OBJS)\test_gui_rawbmp.obj &
 	$(OBJS)\test_gui_htmlwindow.obj &
 	$(OBJS)\test_gui_menu.obj &
 	$(OBJS)\test_gui_guifuncs.obj &
 	$(OBJS)\test_gui_selstoretest.obj &
 	$(OBJS)\test_gui_garbage.obj &
@@ -427,8 +428,8 @@ TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_socket.obj &
 	$(OBJS)\test_gui_boxsizer.obj &
 	$(OBJS)\test_gui_clientsize.obj &
-	$(OBJS)\test_gui_setsize.obj &
+	$(OBJS)\test_gui_setsize.obj &
-	$(OBJS)\test_gui_xrctest.obj
+	$(OBJS)\test_gui_xrctest.obj
 all : $(OBJS)
@@ -468,7 +469,7 @@ $(OBJS)\test_gui.exe :  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
 	@%append $(OBJS)\test_gui.lbc option caseexact
 	@%append $(OBJS)\test_gui.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)
 	@for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i
-	@for %i in ( $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\test_gui.lbc library %i
+	@for %i in ( $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\test_gui.lbc library %i
 	@%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res
 	@for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i
 	wlink @$(OBJS)\test_gui.lbc
@@ -737,15 +738,15 @@ $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc
 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_asserthelper.obj :  .AUTODEPEND .\asserthelper.cpp
+$(OBJS)\test_gui_asserthelper.obj :  .AUTODEPEND .\asserthelper.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_test.obj :  .AUTODEPEND .\test.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_testableframe.obj :  .AUTODEPEND .\testableframe.cpp
+$(OBJS)\test_gui_testableframe.obj :  .AUTODEPEND .\testableframe.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_rect.obj :  .AUTODEPEND .\geometry\rect.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
@@ -770,129 +771,129 @@ $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp
 $(OBJS)\test_gui_config.obj :  .AUTODEPEND .\config\config.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_bitmapcomboboxtest.obj :  .AUTODEPEND .\controls\bitmapcomboboxtest.cpp
+$(OBJS)\test_gui_bitmapcomboboxtest.obj :  .AUTODEPEND .\controls\bitmapcomboboxtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_bitmaptogglebuttontest.obj :  .AUTODEPEND .\controls\bitmaptogglebuttontest.cpp
+$(OBJS)\test_gui_bitmaptogglebuttontest.obj :  .AUTODEPEND .\controls\bitmaptogglebuttontest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_bookctrlbasetest.obj :  .AUTODEPEND .\controls\bookctrlbasetest.cpp
+$(OBJS)\test_gui_bookctrlbasetest.obj :  .AUTODEPEND .\controls\bookctrlbasetest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_buttontest.obj :  .AUTODEPEND .\controls\buttontest.cpp
+$(OBJS)\test_gui_buttontest.obj :  .AUTODEPEND .\controls\buttontest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_checkboxtest.obj :  .AUTODEPEND .\controls\checkboxtest.cpp
+$(OBJS)\test_gui_checkboxtest.obj :  .AUTODEPEND .\controls\checkboxtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_checklistboxtest.obj :  .AUTODEPEND .\controls\checklistboxtest.cpp
+$(OBJS)\test_gui_checklistboxtest.obj :  .AUTODEPEND .\controls\checklistboxtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_choicebooktest.obj :  .AUTODEPEND .\controls\choicebooktest.cpp
+$(OBJS)\test_gui_choicebooktest.obj :  .AUTODEPEND .\controls\choicebooktest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_choicetest.obj :  .AUTODEPEND .\controls\choicetest.cpp
+$(OBJS)\test_gui_choicetest.obj :  .AUTODEPEND .\controls\choicetest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_comboboxtest.obj :  .AUTODEPEND .\controls\comboboxtest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_frametest.obj :  .AUTODEPEND .\controls\frametest.cpp
+$(OBJS)\test_gui_frametest.obj :  .AUTODEPEND .\controls\frametest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_gaugetest.obj :  .AUTODEPEND .\controls\gaugetest.cpp
+$(OBJS)\test_gui_gaugetest.obj :  .AUTODEPEND .\controls\gaugetest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_gridtest.obj :  .AUTODEPEND .\controls\gridtest.cpp
+$(OBJS)\test_gui_gridtest.obj :  .AUTODEPEND .\controls\gridtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_headerctrltest.obj :  .AUTODEPEND .\controls\headerctrltest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_hyperlinkctrltest.obj :  .AUTODEPEND .\controls\hyperlinkctrltest.cpp
+$(OBJS)\test_gui_hyperlinkctrltest.obj :  .AUTODEPEND .\controls\hyperlinkctrltest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_itemcontainertest.obj :  .AUTODEPEND .\controls\itemcontainertest.cpp
+$(OBJS)\test_gui_itemcontainertest.obj :  .AUTODEPEND .\controls\itemcontainertest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_label.obj :  .AUTODEPEND .\controls\label.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_listbasetest.obj :  .AUTODEPEND .\controls\listbasetest.cpp
+$(OBJS)\test_gui_listbasetest.obj :  .AUTODEPEND .\controls\listbasetest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_listbooktest.obj :  .AUTODEPEND .\controls\listbooktest.cpp
+$(OBJS)\test_gui_listbooktest.obj :  .AUTODEPEND .\controls\listbooktest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_listboxtest.obj :  .AUTODEPEND .\controls\listboxtest.cpp
+$(OBJS)\test_gui_listboxtest.obj :  .AUTODEPEND .\controls\listboxtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_listctrltest.obj :  .AUTODEPEND .\controls\listctrltest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_listviewtest.obj :  .AUTODEPEND .\controls\listviewtest.cpp
+$(OBJS)\test_gui_listviewtest.obj :  .AUTODEPEND .\controls\listviewtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_notebooktest.obj :  .AUTODEPEND .\controls\notebooktest.cpp
+$(OBJS)\test_gui_notebooktest.obj :  .AUTODEPEND .\controls\notebooktest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_pickerbasetest.obj :  .AUTODEPEND .\controls\pickerbasetest.cpp
+$(OBJS)\test_gui_pickerbasetest.obj :  .AUTODEPEND .\controls\pickerbasetest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_pickertest.obj :  .AUTODEPEND .\controls\pickertest.cpp
+$(OBJS)\test_gui_pickertest.obj :  .AUTODEPEND .\controls\pickertest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_radioboxtest.obj :  .AUTODEPEND .\controls\radioboxtest.cpp
+$(OBJS)\test_gui_radioboxtest.obj :  .AUTODEPEND .\controls\radioboxtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_radiobuttontest.obj :  .AUTODEPEND .\controls\radiobuttontest.cpp
+$(OBJS)\test_gui_radiobuttontest.obj :  .AUTODEPEND .\controls\radiobuttontest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_rearrangelisttest.obj :  .AUTODEPEND .\controls\rearrangelisttest.cpp
+$(OBJS)\test_gui_rearrangelisttest.obj :  .AUTODEPEND .\controls\rearrangelisttest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_richtextctrltest.obj :  .AUTODEPEND .\controls\richtextctrltest.cpp
+$(OBJS)\test_gui_richtextctrltest.obj :  .AUTODEPEND .\controls\richtextctrltest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_slidertest.obj :  .AUTODEPEND .\controls\slidertest.cpp
+$(OBJS)\test_gui_slidertest.obj :  .AUTODEPEND .\controls\slidertest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_spinctrldbltest.obj :  .AUTODEPEND .\controls\spinctrldbltest.cpp
+$(OBJS)\test_gui_spinctrldbltest.obj :  .AUTODEPEND .\controls\spinctrldbltest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_spinctrltest.obj :  .AUTODEPEND .\controls\spinctrltest.cpp
+$(OBJS)\test_gui_spinctrltest.obj :  .AUTODEPEND .\controls\spinctrltest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_textctrltest.obj :  .AUTODEPEND .\controls\textctrltest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 $(OBJS)\test_gui_textentrytest.obj :  .AUTODEPEND .\controls\textentrytest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_togglebuttontest.obj :  .AUTODEPEND .\controls\togglebuttontest.cpp
+$(OBJS)\test_gui_togglebuttontest.obj :  .AUTODEPEND .\controls\togglebuttontest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_toolbooktest.obj :  .AUTODEPEND .\controls\toolbooktest.cpp
+$(OBJS)\test_gui_toolbooktest.obj :  .AUTODEPEND .\controls\toolbooktest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
-$(OBJS)\test_gui_treebooktest.obj :  .AUTODEPEND .\controls\treebooktest.cpp
+$(OBJS)\test_gui_treebooktest.obj :  .AUTODEPEND .\controls\treebooktest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_treectrltest.obj :  .AUTODEPEND .\controls\treectrltest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_windowtest.obj :  .AUTODEPEND .\controls\windowtest.cpp
+$(OBJS)\test_gui_windowtest.obj :  .AUTODEPEND .\controls\windowtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_clone.obj :  .AUTODEPEND .\events\clone.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 $(OBJS)\test_gui_propagation.obj :  .AUTODEPEND .\events\propagation.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_keyboard.obj :  .AUTODEPEND .\events\keyboard.cpp
+$(OBJS)\test_gui_keyboard.obj :  .AUTODEPEND .\events\keyboard.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+
 $(OBJS)\test_gui_fonttest.obj :  .AUTODEPEND .\font\fonttest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
@@ -905,6 +906,9 @@ $(OBJS)\test_gui_rawbmp.obj :  .AUTODEPEND .\image\rawbmp.cpp
 $(OBJS)\test_gui_htmlwindow.obj :  .AUTODEPEND .\html\htmlwindow.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 $(OBJS)\test_gui_menu.obj :  .AUTODEPEND .\menu\menu.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 $(OBJS)\test_gui_guifuncs.obj :  .AUTODEPEND .\misc\guifuncs.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
@@ -929,5 +933,6 @@ $(OBJS)\test_gui_clientsize.obj :  .AUTODEPEND .\window\clientsize.cpp
 $(OBJS)\test_gui_setsize.obj :  .AUTODEPEND .\window\setsize.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-$(OBJS)\test_gui_xrctest.obj :  .AUTODEPEND .\xml\xrctest.cpp
+$(OBJS)\test_gui_xrctest.obj :  .AUTODEPEND .\xml\xrctest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
--- a/tests/menu/menu.cpp
+++ b/tests/menu/menu.cpp
@@ -0,0 +1,266 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        tests/menu/menu.cpp
 // Purpose:     wxMenu unit test
 // Author:      wxWidgets team
 // Created:     2010-11-10
 // RCS-ID:      $Id$
 // Copyright:   (c) 2010 wxWidgets team
 ///////////////////////////////////////////////////////////////////////////////
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 #include "testprec.h"
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
 #ifndef WX_PRECOMP
    #include "wx/wx.h"
 #endif // WX_PRECOMP
 #include "wx/menu.h"
 #include <stdarg.h>
 // ----------------------------------------------------------------------------
 // helper
 // ----------------------------------------------------------------------------
 namespace
 {
 enum
 {
    MenuTestCase_Quit = wxID_EXIT,
    MenuTestCase_About = wxID_ABOUT,
    MenuTestCase_First = 10000
 };
 void PopulateMenu(wxMenu* menu, const wxString& name,  size_t& itemcount)
 {
    // Start at item 1 to make it human-readable ;)
    for (int n=1; n<6; ++n, ++itemcount)
    {
        wxString label = name; label << n;
        menu->Append(MenuTestCase_First + itemcount, label, label + " help string");
    }
 }
 void RecursivelyCountMenuItems(const wxMenu* menu, size_t& count)
 {
    CPPUNIT_ASSERT( menu );
    count += menu->GetMenuItemCount();
    for (size_t n=0; n < menu->GetMenuItemCount(); ++n)
    {
        wxMenuItem* item = menu->FindItemByPosition(n);
        if (item->IsSubMenu())
        {
            RecursivelyCountMenuItems(item->GetSubMenu(), count);
        }
    }
 }
 } // anon namespace
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
 class MenuTestCase : public CppUnit::TestCase
 {
 public:
    MenuTestCase() {}
    virtual void setUp() { CreateFrame(); }
    virtual void tearDown() { m_frame->Destroy(); }
 private:
    CPPUNIT_TEST_SUITE( MenuTestCase );
        CPPUNIT_TEST( FindInMenubar );
        CPPUNIT_TEST( FindInMenu );
        CPPUNIT_TEST( Count );
    CPPUNIT_TEST_SUITE_END();
    void CreateFrame();
    void FindInMenubar();
    void FindInMenu();
    void Count();
    wxFrame* m_frame;
    // Holds the number of menuitems contained in all the menus
    size_t m_itemCount;
    // Store here the id of a known submenu item, to be searched for later
    int m_submenuItemId;
    // and a sub-submenu item
    int m_subsubmenuItemId;
    wxArrayString m_menuLabels;
    DECLARE_NO_COPY_CLASS(MenuTestCase)
 };
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( MenuTestCase );
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MenuTestCase, "MenuTestCase" );
 void MenuTestCase::CreateFrame()
 {
    m_frame = new wxFrame(NULL, wxID_ANY, "test frame");
    wxMenu *fileMenu = new wxMenu;
    wxMenu *helpMenu = new wxMenu;
    wxMenu *subMenu = new wxMenu;
    wxMenu *subsubMenu = new wxMenu;
    size_t itemcount = 0;
    PopulateMenu(subsubMenu, "Subsubmenu item ", itemcount);
    // Store one of its IDs for later
    m_subsubmenuItemId = MenuTestCase_First + itemcount - 2;
    PopulateMenu(subMenu, "Submenu item ", itemcount);
    // Store one of its IDs for later
    m_submenuItemId = MenuTestCase_First + itemcount - 2;
    subMenu->AppendSubMenu(subsubMenu, "Subsubmen&u", "Test a subsubmenu");
    PopulateMenu(fileMenu, "Filemenu item ", itemcount);
    // Add a 'real' item too, for future tests
    fileMenu->Append(MenuTestCase_Quit, "E&xit\tAlt-X", "Quit this program");
    PopulateMenu(helpMenu, "Helpmenu item ", itemcount);
    helpMenu->Append(MenuTestCase_About, "&About...\tF1",
                     "(Would normally) Show about dialog");
    helpMenu->AppendSubMenu(subMenu, "Sub&menu", "Test a submenu");
    // +2 for E&xit and &About, +2 for the 2 submenus
    m_itemCount = itemcount + 4;
    // Use an arraystring here, to help with future tests
    m_menuLabels.Add("&File");
    m_menuLabels.Add("&Help");
    wxMenuBar *menuBar = new wxMenuBar();
    menuBar->Append(fileMenu, m_menuLabels[0]);
    menuBar->Append(helpMenu, m_menuLabels[1]);
    m_frame->SetMenuBar(menuBar);
 }
 void MenuTestCase::FindInMenubar()
 {
    wxMenuBar* bar = m_frame->GetMenuBar();
    // Find by name:
    CPPUNIT_ASSERT( bar->FindMenu("File") != wxNOT_FOUND );
    CPPUNIT_ASSERT( bar->FindMenu("&File") != wxNOT_FOUND );
    CPPUNIT_ASSERT( bar->FindMenu("&Fail") == wxNOT_FOUND );
    // Find by menu name plus item name:
    CPPUNIT_ASSERT( bar->FindMenuItem("File", "Exit") != wxNOT_FOUND );
    CPPUNIT_ASSERT( bar->FindMenuItem("&File", "E&xit") != wxNOT_FOUND );
    // and using the menu title
    int index = bar->FindMenu("&File");
    CPPUNIT_ASSERT( index != wxNOT_FOUND );
    wxString menutitle = bar->GetMenuLabel(index);
    CPPUNIT_ASSERT( bar->FindMenuItem(menutitle, "E&xit") != wxNOT_FOUND );
    // Find by position:
    for (size_t n=0; n < bar->GetMenuCount(); ++n)
    {
        CPPUNIT_ASSERT( bar->GetMenu(n) );
    }
    // Find by id:
    wxMenu* menu = NULL;
    wxMenuItem* item = NULL;
    item = bar->FindItem(MenuTestCase_Quit, &menu);
    CPPUNIT_ASSERT( item );
    CPPUNIT_ASSERT( menu );
    // Check that the correct menu was found
    CPPUNIT_ASSERT( menu->FindChildItem(MenuTestCase_Quit) );
    // Find submenu item:
    item = bar->FindItem(m_submenuItemId, &menu);
    CPPUNIT_ASSERT( item );
    CPPUNIT_ASSERT( menu );
    // and, for completeness, a submenu one:
    item = bar->FindItem(m_subsubmenuItemId, &menu);
    CPPUNIT_ASSERT( item );
    CPPUNIT_ASSERT( menu );
 }
 void MenuTestCase::FindInMenu()
 {
    wxMenuBar* bar = m_frame->GetMenuBar();
    // Find by name:
    wxMenu* menuFind = bar->GetMenu(0);
    CPPUNIT_ASSERT( menuFind->FindItem("Exit") != wxNOT_FOUND );
    CPPUNIT_ASSERT( menuFind->FindItem("E&xit") != wxNOT_FOUND );
    // and for submenus
    wxMenu* menuHelp = bar->GetMenu(1);
    CPPUNIT_ASSERT( menuHelp->FindItem("Submenu") != wxNOT_FOUND );
    CPPUNIT_ASSERT( menuHelp->FindItem("Sub&menu") != wxNOT_FOUND );
    // Find by position:
    for (size_t n=0; n < menuHelp->GetMenuItemCount(); ++n)
    {
        CPPUNIT_ASSERT( menuHelp->FindItemByPosition(n) );
    }
    // Find by id:
    CPPUNIT_ASSERT( menuHelp->FindItem(MenuTestCase_About) );
    CPPUNIT_ASSERT( menuHelp->FindItem(MenuTestCase_Quit) == NULL );
    for (size_t n=0; n < menuHelp->GetMenuItemCount(); ++n)
    {
        size_t locatedAt;
        wxMenuItem* itemByPos = menuHelp->FindItemByPosition(n);
        CPPUNIT_ASSERT( itemByPos );
        wxMenuItem* itemById = menuHelp->FindChildItem(itemByPos->GetId(), &locatedAt);
        CPPUNIT_ASSERT_EQUAL( itemByPos, itemById );
        CPPUNIT_ASSERT_EQUAL( locatedAt, n );
    }
    // Find submenu item:
    for (size_t n=0; n < menuHelp->GetMenuItemCount(); ++n)
    {
        wxMenuItem* item = menuHelp->FindItemByPosition(n);
        if (item->IsSubMenu())
        {
            wxMenu* submenu;
            wxMenuItem* submenuItem = menuHelp->FindItem(m_submenuItemId, &submenu);
            CPPUNIT_ASSERT( submenuItem );
            CPPUNIT_ASSERT( item->GetSubMenu() == submenu );
        }
    }
 }
 void MenuTestCase::Count()
 {
    wxMenuBar* bar = m_frame->GetMenuBar();
    // I suppose you could call this "counting menubars" :)
    CPPUNIT_ASSERT( bar );
    CPPUNIT_ASSERT_EQUAL( bar->GetMenuCount(), 2 );
    size_t count = 0;
    for (size_t n=0; n < bar->GetMenuCount(); ++n)
    {
        RecursivelyCountMenuItems(bar->GetMenu(n), count);
    }
    CPPUNIT_ASSERT_EQUAL( count, m_itemCount );
 }
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -181,6 +181,7 @@
            image/image.cpp
            image/rawbmp.cpp
            html/htmlwindow.cpp
            menu/menu.cpp
            misc/guifuncs.cpp
            misc/selstoretest.cpp
            misc/garbage.cpp
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /debug /pdb:"vc_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD BASE LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /debug /pdb:"vc_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /debug /pdb:"vc_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /debug /pdb:"vc_mswunivudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
 !ELSEIF  "$(CFG)" == "test_gui - Win32 DLL Universal Debug"
@@ -77,8 +77,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /pdb:"vc_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD BASE LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /pdb:"vc_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /pdb:"vc_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /pdb:"vc_mswunivuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
 !ELSEIF  "$(CFG)" == "test_gui - Win32 DLL Release"
@@ -100,8 +100,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /debug /pdb:"vc_mswudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD BASE LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /debug /pdb:"vc_mswudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /debug /pdb:"vc_mswudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /debug /pdb:"vc_mswudll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
 !ELSEIF  "$(CFG)" == "test_gui - Win32 DLL Debug"
@@ -123,8 +123,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /pdb:"vc_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD BASE LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /pdb:"vc_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /pdb:"vc_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
+# ADD LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /pdb:"vc_mswuddll\test_gui.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Universal Release"
@@ -146,8 +146,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /debug /pdb:"vc_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD BASE LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /debug /pdb:"vc_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /debug /pdb:"vc_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD LINK32 wxmswuniv29u_richtext.lib wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /debug /pdb:"vc_mswunivu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Universal Debug"
@@ -169,8 +169,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /pdb:"vc_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD BASE LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /pdb:"vc_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /pdb:"vc_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD LINK32 wxmswuniv29ud_richtext.lib wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /pdb:"vc_mswunivud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Release"
@@ -192,8 +192,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /debug /pdb:"vc_mswu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD BASE LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /debug /pdb:"vc_mswu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /debug /pdb:"vc_mswu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD LINK32 wxmsw29u_richtext.lib wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /debug /pdb:"vc_mswu\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
 !ELSEIF  "$(CFG)" == "test_gui - Win32 Debug"
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /pdb:"vc_mswud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD BASE LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /pdb:"vc_mswud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /pdb:"vc_mswud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
+# ADD LINK32 wxmsw29ud_richtext.lib wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /pdb:"vc_mswud\test_gui.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console
 !ENDIF
@@ -235,50 +235,50 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
-SOURCE=.\asserthelper.cpp
+SOURCE=.\asserthelper.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\graphics\bitmap.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\bitmapcomboboxtest.cpp
+SOURCE=.\controls\bitmapcomboboxtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\bitmaptogglebuttontest.cpp
+SOURCE=.\controls\bitmaptogglebuttontest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\bookctrlbasetest.cpp
+SOURCE=.\controls\bookctrlbasetest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\sizers\boxsizer.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\buttontest.cpp
+SOURCE=.\controls\buttontest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\checkboxtest.cpp
+SOURCE=.\controls\checkboxtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\checklistboxtest.cpp
+SOURCE=.\controls\checklistboxtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\choicebooktest.cpp
+SOURCE=.\controls\choicebooktest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\choicetest.cpp
+SOURCE=.\controls\choicetest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\window\clientsize.cpp
 # End Source File
 # Begin Source File
@@ -313,22 +313,22 @@ SOURCE=.\font\fonttest.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\frametest.cpp
+SOURCE=.\controls\frametest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\misc\garbage.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\gaugetest.cpp
+SOURCE=.\controls\gaugetest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\gridtest.cpp
+SOURCE=.\controls\gridtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\misc\guifuncs.cpp
 # End Source File
 # Begin Source File
@@ -341,62 +341,66 @@ SOURCE=.\html\htmlwindow.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\hyperlinkctrltest.cpp
+SOURCE=.\controls\hyperlinkctrltest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\image\image.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\itemcontainertest.cpp
+SOURCE=.\controls\itemcontainertest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\events\keyboard.cpp
+SOURCE=.\events\keyboard.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\controls\label.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\listbasetest.cpp
+SOURCE=.\controls\listbasetest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\listbooktest.cpp
+SOURCE=.\controls\listbooktest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\listboxtest.cpp
+SOURCE=.\controls\listboxtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\controls\listctrltest.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\listviewtest.cpp
+SOURCE=.\controls\listviewtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\graphics\measuring.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\notebooktest.cpp
+SOURCE=.\menu\menu.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\pickerbasetest.cpp
+SOURCE=.\controls\notebooktest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\pickertest.cpp
+SOURCE=.\controls\pickerbasetest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\controls\pickertest.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\geometry\point.cpp
 # End Source File
 # Begin Source File
@@ -405,30 +409,30 @@ SOURCE=.\events\propagation.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\radioboxtest.cpp
+SOURCE=.\controls\radioboxtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\radiobuttontest.cpp
+SOURCE=.\controls\radiobuttontest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\image\rawbmp.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\rearrangelisttest.cpp
+SOURCE=.\controls\rearrangelisttest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\geometry\rect.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\richtextctrltest.cpp
+SOURCE=.\controls\richtextctrltest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\..\samples\sample.rc
 # End Source File
 # Begin Source File
@@ -449,30 +453,30 @@ SOURCE=.\geometry\size.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\slidertest.cpp
+SOURCE=.\controls\slidertest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\net\socket.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\spinctrldbltest.cpp
+SOURCE=.\controls\spinctrldbltest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\spinctrltest.cpp
+SOURCE=.\controls\spinctrltest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\test.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\testableframe.cpp
+SOURCE=.\testableframe.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\controls\textctrltest.cpp
 # End Source File
 # Begin Source File
@@ -481,28 +485,28 @@ SOURCE=.\controls\textentrytest.cpp
 # End Source File
 # Begin Source File
-SOURCE=.\controls\togglebuttontest.cpp
+SOURCE=.\controls\togglebuttontest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\toolbooktest.cpp
+SOURCE=.\controls\toolbooktest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\treebooktest.cpp
+SOURCE=.\controls\treebooktest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
 SOURCE=.\controls\treectrltest.cpp
 # End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\controls\windowtest.cpp
+SOURCE=.\controls\windowtest.cpp
-# End Source File
+# End Source File
-# Begin Source File
+# Begin Source File
-
+
-SOURCE=.\xml\xrctest.cpp
+SOURCE=.\xml\xrctest.cpp
-# End Source File
+# End Source File
 # End Group
 # End Target
 # End Project
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -49,7 +49,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -114,7 +114,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -184,7 +184,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -249,7 +249,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -319,7 +319,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -384,7 +384,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -454,7 +454,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -519,7 +519,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -566,39 +566,39 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\asserthelper.cpp">
+				RelativePath=".\asserthelper.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\graphics\bitmap.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\bitmapcomboboxtest.cpp">
+				RelativePath=".\controls\bitmapcomboboxtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\bitmaptogglebuttontest.cpp">
+				RelativePath=".\controls\bitmaptogglebuttontest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\bookctrlbasetest.cpp">
+				RelativePath=".\controls\bookctrlbasetest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\sizers\boxsizer.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\buttontest.cpp">
+				RelativePath=".\controls\buttontest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\checkboxtest.cpp">
+				RelativePath=".\controls\checkboxtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\checklistboxtest.cpp">
+				RelativePath=".\controls\checklistboxtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\choicebooktest.cpp">
+				RelativePath=".\controls\choicebooktest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\choicetest.cpp">
+				RelativePath=".\controls\choicetest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\window\clientsize.cpp">
 			</File>
 			<File
@@ -671,18 +671,18 @@
 				RelativePath=".\font\fonttest.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\frametest.cpp">
+				RelativePath=".\controls\frametest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\garbage.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\gaugetest.cpp">
+				RelativePath=".\controls\gaugetest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\gridtest.cpp">
+				RelativePath=".\controls\gridtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\guifuncs.cpp">
 			</File>
 			<File
@@ -692,72 +692,75 @@
 				RelativePath=".\html\htmlwindow.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\hyperlinkctrltest.cpp">
+				RelativePath=".\controls\hyperlinkctrltest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\image\image.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\itemcontainertest.cpp">
+				RelativePath=".\controls\itemcontainertest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\events\keyboard.cpp">
+				RelativePath=".\events\keyboard.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\label.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\listbasetest.cpp">
+				RelativePath=".\controls\listbasetest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\listbooktest.cpp">
+				RelativePath=".\controls\listbooktest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\listboxtest.cpp">
+				RelativePath=".\controls\listboxtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\listctrltest.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\listviewtest.cpp">
+				RelativePath=".\controls\listviewtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\graphics\measuring.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\notebooktest.cpp">
+				RelativePath=".\menu\menu.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\pickerbasetest.cpp">
+				RelativePath=".\controls\notebooktest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\pickertest.cpp">
+				RelativePath=".\controls\pickerbasetest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\pickertest.cpp">
 			</File>
 			<File
 				RelativePath=".\geometry\point.cpp">
 			</File>
 			<File
 				RelativePath=".\events\propagation.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\radioboxtest.cpp">
+				RelativePath=".\controls\radioboxtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\radiobuttontest.cpp">
+				RelativePath=".\controls\radiobuttontest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\image\rawbmp.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\rearrangelisttest.cpp">
+				RelativePath=".\controls\rearrangelisttest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\geometry\rect.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\richtextctrltest.cpp">
+				RelativePath=".\controls\richtextctrltest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\selstoretest.cpp">
 			</File>
 			<File
@@ -770,47 +773,47 @@
 				RelativePath=".\geometry\size.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\slidertest.cpp">
+				RelativePath=".\controls\slidertest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\net\socket.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\spinctrldbltest.cpp">
+				RelativePath=".\controls\spinctrldbltest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\spinctrltest.cpp">
+				RelativePath=".\controls\spinctrltest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\test.cpp">
 			</File>
 			<File
-				RelativePath=".\testableframe.cpp">
+				RelativePath=".\testableframe.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\textctrltest.cpp">
 			</File>
 			<File
 				RelativePath=".\controls\textentrytest.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\togglebuttontest.cpp">
+				RelativePath=".\controls\togglebuttontest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\toolbooktest.cpp">
+				RelativePath=".\controls\toolbooktest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\treebooktest.cpp">
+				RelativePath=".\controls\treebooktest.cpp">
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\treectrltest.cpp">
 			</File>
-			<File
+			<File
-				RelativePath=".\controls\windowtest.cpp">
+				RelativePath=".\controls\windowtest.cpp">
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\xml\xrctest.cpp">
+				RelativePath=".\xml\xrctest.cpp">
-			</File>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -83,7 +83,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -180,7 +180,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -282,7 +282,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -379,7 +379,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -481,7 +481,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -578,7 +578,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -680,7 +680,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -777,7 +777,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -828,50 +828,50 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\asserthelper.cpp"
+				RelativePath=".\asserthelper.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\graphics\bitmap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\bitmapcomboboxtest.cpp"
+				RelativePath=".\controls\bitmapcomboboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\bitmaptogglebuttontest.cpp"
+				RelativePath=".\controls\bitmaptogglebuttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\bookctrlbasetest.cpp"
+				RelativePath=".\controls\bookctrlbasetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\sizers\boxsizer.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\buttontest.cpp"
+				RelativePath=".\controls\buttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\checkboxtest.cpp"
+				RelativePath=".\controls\checkboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\checklistboxtest.cpp"
+				RelativePath=".\controls\checklistboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\choicebooktest.cpp"
+				RelativePath=".\controls\choicebooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\choicetest.cpp"
+				RelativePath=".\controls\choicetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\window\clientsize.cpp"
 				>
 			</File>
@@ -968,22 +968,22 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\frametest.cpp"
+				RelativePath=".\controls\frametest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\garbage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\gaugetest.cpp"
+				RelativePath=".\controls\gaugetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\gridtest.cpp"
+				RelativePath=".\controls\gridtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\guifuncs.cpp"
 				>
 			</File>
@@ -996,62 +996,66 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\hyperlinkctrltest.cpp"
+				RelativePath=".\controls\hyperlinkctrltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\image\image.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\itemcontainertest.cpp"
+				RelativePath=".\controls\itemcontainertest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\events\keyboard.cpp"
+				RelativePath=".\events\keyboard.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\label.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\listbasetest.cpp"
+				RelativePath=".\controls\listbasetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\listbooktest.cpp"
+				RelativePath=".\controls\listbooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\listboxtest.cpp"
+				RelativePath=".\controls\listboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\listctrltest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\listviewtest.cpp"
+				RelativePath=".\controls\listviewtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\graphics\measuring.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\notebooktest.cpp"
+				RelativePath=".\menu\menu.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\pickerbasetest.cpp"
+				RelativePath=".\controls\notebooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\pickertest.cpp"
+				RelativePath=".\controls\pickerbasetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\pickertest.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\geometry\point.cpp"
 				>
 			</File>
@@ -1060,30 +1064,30 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\radioboxtest.cpp"
+				RelativePath=".\controls\radioboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\radiobuttontest.cpp"
+				RelativePath=".\controls\radiobuttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\image\rawbmp.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\rearrangelisttest.cpp"
+				RelativePath=".\controls\rearrangelisttest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\geometry\rect.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\richtextctrltest.cpp"
+				RelativePath=".\controls\richtextctrltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\selstoretest.cpp"
 				>
 			</File>
@@ -1100,30 +1104,30 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\slidertest.cpp"
+				RelativePath=".\controls\slidertest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\net\socket.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\spinctrldbltest.cpp"
+				RelativePath=".\controls\spinctrldbltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\spinctrltest.cpp"
+				RelativePath=".\controls\spinctrltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\test.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\testableframe.cpp"
+				RelativePath=".\testableframe.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\textctrltest.cpp"
 				>
 			</File>
@@ -1132,29 +1136,29 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\togglebuttontest.cpp"
+				RelativePath=".\controls\togglebuttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\toolbooktest.cpp"
+				RelativePath=".\controls\toolbooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\treebooktest.cpp"
+				RelativePath=".\controls\treebooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\treectrltest.cpp"
 				>
 			</File>
-			<File
+			<File
-				RelativePath=".\controls\windowtest.cpp"
+				RelativePath=".\controls\windowtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\xml\xrctest.cpp"
+				RelativePath=".\xml\xrctest.cpp"
-				>
+				>
-			</File>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -82,7 +82,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -176,7 +176,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -274,7 +274,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -368,7 +368,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -560,7 +560,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -658,7 +658,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -752,7 +752,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswunivudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -800,50 +800,50 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\asserthelper.cpp"
+				RelativePath=".\asserthelper.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\graphics\bitmap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\bitmapcomboboxtest.cpp"
+				RelativePath=".\controls\bitmapcomboboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\bitmaptogglebuttontest.cpp"
+				RelativePath=".\controls\bitmaptogglebuttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\bookctrlbasetest.cpp"
+				RelativePath=".\controls\bookctrlbasetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\sizers\boxsizer.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\buttontest.cpp"
+				RelativePath=".\controls\buttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\checkboxtest.cpp"
+				RelativePath=".\controls\checkboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\checklistboxtest.cpp"
+				RelativePath=".\controls\checklistboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\choicebooktest.cpp"
+				RelativePath=".\controls\choicebooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\choicetest.cpp"
+				RelativePath=".\controls\choicetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\window\clientsize.cpp"
 				>
 			</File>
@@ -940,22 +940,22 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\frametest.cpp"
+				RelativePath=".\controls\frametest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\garbage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\gaugetest.cpp"
+				RelativePath=".\controls\gaugetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\gridtest.cpp"
+				RelativePath=".\controls\gridtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\guifuncs.cpp"
 				>
 			</File>
@@ -968,62 +968,66 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\hyperlinkctrltest.cpp"
+				RelativePath=".\controls\hyperlinkctrltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\image\image.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\itemcontainertest.cpp"
+				RelativePath=".\controls\itemcontainertest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\events\keyboard.cpp"
+				RelativePath=".\events\keyboard.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\label.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\listbasetest.cpp"
+				RelativePath=".\controls\listbasetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\listbooktest.cpp"
+				RelativePath=".\controls\listbooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\listboxtest.cpp"
+				RelativePath=".\controls\listboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\listctrltest.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\listviewtest.cpp"
+				RelativePath=".\controls\listviewtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\graphics\measuring.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\notebooktest.cpp"
+				RelativePath=".\menu\menu.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\pickerbasetest.cpp"
+				RelativePath=".\controls\notebooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\pickertest.cpp"
+				RelativePath=".\controls\pickerbasetest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\pickertest.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\geometry\point.cpp"
 				>
 			</File>
@@ -1032,30 +1036,30 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\radioboxtest.cpp"
+				RelativePath=".\controls\radioboxtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\radiobuttontest.cpp"
+				RelativePath=".\controls\radiobuttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\image\rawbmp.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\rearrangelisttest.cpp"
+				RelativePath=".\controls\rearrangelisttest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\geometry\rect.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\richtextctrltest.cpp"
+				RelativePath=".\controls\richtextctrltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\misc\selstoretest.cpp"
 				>
 			</File>
@@ -1072,30 +1076,30 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\slidertest.cpp"
+				RelativePath=".\controls\slidertest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\net\socket.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\controls\spinctrldbltest.cpp"
+				RelativePath=".\controls\spinctrldbltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\spinctrltest.cpp"
+				RelativePath=".\controls\spinctrltest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\test.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\testableframe.cpp"
+				RelativePath=".\testableframe.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\textctrltest.cpp"
 				>
 			</File>
@@ -1104,29 +1108,29 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\togglebuttontest.cpp"
+				RelativePath=".\controls\togglebuttontest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\toolbooktest.cpp"
+				RelativePath=".\controls\toolbooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\controls\treebooktest.cpp"
+				RelativePath=".\controls\treebooktest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
 				RelativePath=".\controls\treectrltest.cpp"
 				>
 			</File>
-			<File
+			<File
-				RelativePath=".\controls\windowtest.cpp"
+				RelativePath=".\controls\windowtest.cpp"
-				>
+				>
-			</File>
+			</File>
-			<File
+			<File
-				RelativePath=".\xml\xrctest.cpp"
+				RelativePath=".\xml\xrctest.cpp"
-				>
+				>
-			</File>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"