X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0526c8cc07ac02aeb1d95afecfa0d9201a8ddea0..bf8f10225c08bf5473fa35423f56e01f1819f971:/tests/makefile.bcc?ds=sidebyside

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index c093d69878..3f816730c2 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.8 (http://www.bakefile.org)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -84,6 +84,7 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_wxregextest.obj \
 	$(OBJS)\test_scopeguardtest.obj \
 	$(OBJS)\test_iostream.obj \
+	$(OBJS)\test_numformatter.obj \
 	$(OBJS)\test_strings.obj \
 	$(OBJS)\test_stdstrings.obj \
 	$(OBJS)\test_tokenizer.obj \
@@ -129,9 +130,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 \
@@ -139,61 +140,73 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_colour.obj \
 	$(OBJS)\test_gui_ellipsization.obj \
 	$(OBJS)\test_gui_measuring.obj \
+	$(OBJS)\test_gui_affinematrix.obj \
 	$(OBJS)\test_gui_config.obj \
-	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
-	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
-	$(OBJS)\test_gui_bookctrlbasetest.obj \
-	$(OBJS)\test_gui_buttontest.obj \
-	$(OBJS)\test_gui_checkboxtest.obj \
-	$(OBJS)\test_gui_checklistboxtest.obj \
-	$(OBJS)\test_gui_choicebooktest.obj \
-	$(OBJS)\test_gui_choicetest.obj \
+	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
+	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
+	$(OBJS)\test_gui_bookctrlbasetest.obj \
+	$(OBJS)\test_gui_buttontest.obj \
+	$(OBJS)\test_gui_checkboxtest.obj \
+	$(OBJS)\test_gui_checklistboxtest.obj \
+	$(OBJS)\test_gui_choicebooktest.obj \
+	$(OBJS)\test_gui_choicetest.obj \
 	$(OBJS)\test_gui_comboboxtest.obj \
-	$(OBJS)\test_gui_frametest.obj \
-	$(OBJS)\test_gui_gaugetest.obj \
-	$(OBJS)\test_gui_gridtest.obj \
+	$(OBJS)\test_gui_datepickerctrltest.obj \
+	$(OBJS)\test_gui_frametest.obj \
+	$(OBJS)\test_gui_gaugetest.obj \
+	$(OBJS)\test_gui_gridtest.obj \
 	$(OBJS)\test_gui_headerctrltest.obj \
-	$(OBJS)\test_gui_hyperlinkctrltest.obj \
-	$(OBJS)\test_gui_itemcontainertest.obj \
+	$(OBJS)\test_gui_htmllboxtest.obj \
+	$(OBJS)\test_gui_hyperlinkctrltest.obj \
+	$(OBJS)\test_gui_itemcontainertest.obj \
 	$(OBJS)\test_gui_label.obj \
-	$(OBJS)\test_gui_listbasetest.obj \
-	$(OBJS)\test_gui_listbooktest.obj \
-	$(OBJS)\test_gui_listboxtest.obj \
+	$(OBJS)\test_gui_listbasetest.obj \
+	$(OBJS)\test_gui_listbooktest.obj \
+	$(OBJS)\test_gui_listboxtest.obj \
 	$(OBJS)\test_gui_listctrltest.obj \
-	$(OBJS)\test_gui_listviewtest.obj \
-	$(OBJS)\test_gui_notebooktest.obj \
-	$(OBJS)\test_gui_pickerbasetest.obj \
-	$(OBJS)\test_gui_pickertest.obj \
-	$(OBJS)\test_gui_radioboxtest.obj \
-	$(OBJS)\test_gui_radiobuttontest.obj \
-	$(OBJS)\test_gui_rearrangelisttest.obj \
-	$(OBJS)\test_gui_richtextctrltest.obj \
-	$(OBJS)\test_gui_slidertest.obj \
-	$(OBJS)\test_gui_spinctrldbltest.obj \
-	$(OBJS)\test_gui_spinctrltest.obj \
+	$(OBJS)\test_gui_listviewtest.obj \
+	$(OBJS)\test_gui_markuptest.obj \
+	$(OBJS)\test_gui_notebooktest.obj \
+	$(OBJS)\test_gui_ownerdrawncomboboxtest.obj \
+	$(OBJS)\test_gui_pickerbasetest.obj \
+	$(OBJS)\test_gui_pickertest.obj \
+	$(OBJS)\test_gui_radioboxtest.obj \
+	$(OBJS)\test_gui_radiobuttontest.obj \
+	$(OBJS)\test_gui_rearrangelisttest.obj \
+	$(OBJS)\test_gui_richtextctrltest.obj \
+	$(OBJS)\test_gui_slidertest.obj \
+	$(OBJS)\test_gui_spinctrldbltest.obj \
+	$(OBJS)\test_gui_spinctrltest.obj \
 	$(OBJS)\test_gui_textctrltest.obj \
 	$(OBJS)\test_gui_textentrytest.obj \
-	$(OBJS)\test_gui_togglebuttontest.obj \
-	$(OBJS)\test_gui_toolbooktest.obj \
-	$(OBJS)\test_gui_treebooktest.obj \
+	$(OBJS)\test_gui_togglebuttontest.obj \
+	$(OBJS)\test_gui_toolbooktest.obj \
+	$(OBJS)\test_gui_treebooktest.obj \
 	$(OBJS)\test_gui_treectrltest.obj \
-	$(OBJS)\test_gui_windowtest.obj \
+	$(OBJS)\test_gui_virtlistctrltest.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_htmlparser.obj \
 	$(OBJS)\test_gui_htmlwindow.obj \
+	$(OBJS)\test_gui_accelentry.obj \
+	$(OBJS)\test_gui_menu.obj \
 	$(OBJS)\test_gui_guifuncs.obj \
 	$(OBJS)\test_gui_selstoretest.obj \
 	$(OBJS)\test_gui_garbage.obj \
 	$(OBJS)\test_gui_settings.obj \
 	$(OBJS)\test_gui_socket.obj \
 	$(OBJS)\test_gui_boxsizer.obj \
+	$(OBJS)\test_gui_wrapsizer.obj \
+	$(OBJS)\test_gui_toplevel.obj \
+	$(OBJS)\test_gui_valnum.obj \
 	$(OBJS)\test_gui_clientsize.obj \
-	$(OBJS)\test_gui_setsize.obj \
-	$(OBJS)\test_gui_xrctest.obj
+	$(OBJS)\test_gui_setsize.obj \
+	$(OBJS)\test_gui_xrctest.obj
 
 ### Conditionally set variables: ###
 
@@ -227,6 +240,9 @@ EXTRALIBS_FOR_BASE =
 !if "$(MONOLITHIC)" == "1"
 EXTRALIBS_FOR_BASE =  
 !endif
+!if "$(MONOLITHIC)" == "1"
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+!endif
 !if "$(USE_GUI)" == "1"
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif
@@ -263,10 +279,10 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_3 = -dWXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_RICHTEXT_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
 __WXLIB_MEDIA_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
@@ -293,9 +309,6 @@ __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od
 !endif
@@ -375,6 +388,9 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
@@ -425,13 +441,13 @@ clean:
 
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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,,
+	c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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,,
 |
 
 !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
 
@@ -587,6 +603,9 @@ $(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
 $(OBJS)\test_iostream.obj: .\strings\iostream.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\iostream.cpp
 
+$(OBJS)\test_numformatter.obj: .\strings\numformatter.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\numformatter.cpp
+
 $(OBJS)\test_strings.obj: .\strings\strings.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\strings.cpp
 
@@ -698,15 +717,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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp
-
+$(OBJS)\test_gui_asserthelper.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\testableframe.cpp
-
+$(OBJS)\test_gui_testableframe.obj: .\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
 
@@ -728,132 +747,150 @@ $(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
 
+$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
-
-$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
-
-$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
-
-$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
-
-$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
-
-$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
-
-$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
-
-$(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicetest.cpp
-
+$(OBJS)\test_gui_bitmapcomboboxtest.obj: .\controls\bitmapcomboboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmapcomboboxtest.cpp
+
+$(OBJS)\test_gui_bitmaptogglebuttontest.obj: .\controls\bitmaptogglebuttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bitmaptogglebuttontest.cpp
+
+$(OBJS)\test_gui_bookctrlbasetest.obj: .\controls\bookctrlbasetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\bookctrlbasetest.cpp
+
+$(OBJS)\test_gui_buttontest.obj: .\controls\buttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\buttontest.cpp
+
+$(OBJS)\test_gui_checkboxtest.obj: .\controls\checkboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checkboxtest.cpp
+
+$(OBJS)\test_gui_checklistboxtest.obj: .\controls\checklistboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\checklistboxtest.cpp
+
+$(OBJS)\test_gui_choicebooktest.obj: .\controls\choicebooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\choicebooktest.cpp
+
+$(OBJS)\test_gui_choicetest.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
-
-$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
-
-$(OBJS)\test_gui_gridtest.obj: .\controls\gridtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gridtest.cpp
+$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp
 
+$(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp
+
+$(OBJS)\test_gui_gaugetest.obj: .\controls\gaugetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\gaugetest.cpp
+
+$(OBJS)\test_gui_gridtest.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
-
-$(OBJS)\test_gui_itemcontainertest.obj: .\controls\itemcontainertest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\itemcontainertest.cpp
-
+$(OBJS)\test_gui_htmllboxtest.obj: .\controls\htmllboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\htmllboxtest.cpp
+
+$(OBJS)\test_gui_hyperlinkctrltest.obj: .\controls\hyperlinkctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\hyperlinkctrltest.cpp
+
+$(OBJS)\test_gui_itemcontainertest.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
-
-$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
-
-$(OBJS)\test_gui_listboxtest.obj: .\controls\listboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listboxtest.cpp
-
+$(OBJS)\test_gui_listbasetest.obj: .\controls\listbasetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbasetest.cpp
+
+$(OBJS)\test_gui_listbooktest.obj: .\controls\listbooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listbooktest.cpp
+
+$(OBJS)\test_gui_listboxtest.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
-
-$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
-
-$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
-
-$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
-
-$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
-
-$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
-
-$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
-
-$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
-
-$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
-
-$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
-
-$(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
-
+$(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
+
+$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
+
+$(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
+
+$(OBJS)\test_gui_ownerdrawncomboboxtest.obj: .\controls\ownerdrawncomboboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\ownerdrawncomboboxtest.cpp
+
+$(OBJS)\test_gui_pickerbasetest.obj: .\controls\pickerbasetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickerbasetest.cpp
+
+$(OBJS)\test_gui_pickertest.obj: .\controls\pickertest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\pickertest.cpp
+
+$(OBJS)\test_gui_radioboxtest.obj: .\controls\radioboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radioboxtest.cpp
+
+$(OBJS)\test_gui_radiobuttontest.obj: .\controls\radiobuttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\radiobuttontest.cpp
+
+$(OBJS)\test_gui_rearrangelisttest.obj: .\controls\rearrangelisttest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\rearrangelisttest.cpp
+
+$(OBJS)\test_gui_richtextctrltest.obj: .\controls\richtextctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\richtextctrltest.cpp
+
+$(OBJS)\test_gui_slidertest.obj: .\controls\slidertest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\slidertest.cpp
+
+$(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrldbltest.cpp
+
+$(OBJS)\test_gui_spinctrltest.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
-
-$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
-
-$(OBJS)\test_gui_treebooktest.obj: .\controls\treebooktest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treebooktest.cpp
-
+$(OBJS)\test_gui_togglebuttontest.obj: .\controls\togglebuttontest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\togglebuttontest.cpp
+
+$(OBJS)\test_gui_toolbooktest.obj: .\controls\toolbooktest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\toolbooktest.cpp
+
+$(OBJS)\test_gui_treebooktest.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\windowtest.cpp
-
+$(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp
+
+$(OBJS)\test_gui_windowtest.obj: .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\keyboard.cpp
-
+$(OBJS)\test_gui_keyboard.obj: .\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
 
@@ -863,9 +900,18 @@ $(OBJS)\test_gui_image.obj: .\image\image.cpp
 $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
 
+$(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlparser.cpp
+
 $(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
 
+$(OBJS)\test_gui_accelentry.obj: .\menu\accelentry.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\menu\accelentry.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
 
@@ -884,11 +930,21 @@ $(OBJS)\test_gui_socket.obj: .\net\socket.cpp
 $(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
 
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\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
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
+$(OBJS)\test_gui_xrctest.obj: .\xml\xrctest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\xml\xrctest.cpp
+