using ordinary Show for popup windows as on MSW which activates it as well, I'll...

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 2aeaea969cb2da1e026bdbdca4b402a9da533347..9c45253af6403bdc3bf0ad13e4af654e4dc387e0 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -31,12 +31,27 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

+WIN32_TOOLKIT_LOWERCASE =
+!ifeq TOOLKIT GTK
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!ifeq TOOLKIT MSW
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif

 PORTNAME =\r
 !ifeq USE_GUI 0\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME =\r
 !ifeq USE_GUI 0\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r

-PORTNAME = msw\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+!endif
+WXBASEPORT =
+!ifeq TOOLKIT MAC
+WXBASEPORT = _carbon
+!endif\r
+COMPILER_VERSION =\r
+!ifeq OFFICIAL_BUILD 1\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r

 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r


@@ -66,17 +81,36 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
+!endif\r
+LIB_GTK =
+!ifeq TOOLKIT GTK
+!ifeq TOOLKIT_VERSION 2
+LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib &
+       gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib &
+       glib-2.0.lib
+!endif
+!endif
+__LIB_PNG_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r

 !endif\r
 __test_gui___depname =\r
 !ifeq USE_GUI 1\r
 __test_gui___depname = $(OBJS)\test_gui.exe\r
 !endif\r
 !endif\r
 __test_gui___depname =\r
 !ifeq USE_GUI 1\r
 __test_gui___depname = $(OBJS)\test_gui.exe\r
 !endif\r

-__WXLIB_RICHTEXT_p =
-!ifeq MONOLITHIC 0
-__WXLIB_RICHTEXT_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
-!endif
+__WXLIB_WEBVIEW_p =\r
+!ifeq MONOLITHIC 0\r
+!ifeq USE_WEBVIEW 1\r
+__WXLIB_WEBVIEW_p = &\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+!endif\r
+!endif\r
+__WXLIB_RICHTEXT_p =\r
+!ifeq MONOLITHIC 0\r
+__WXLIB_RICHTEXT_p = &\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
+!endif\r

 __WXLIB_MEDIA_p =\r
 !ifeq MONOLITHIC 0\r
 !ifeq USE_MEDIA 1\r
 __WXLIB_MEDIA_p =\r
 !ifeq MONOLITHIC 0\r
 !ifeq USE_MEDIA 1\r


@@ -112,10 +146,6 @@ __LIB_JPEG_p =
 !ifeq USE_GUI 1\r
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
 !endif\r
 !ifeq USE_GUI 1\r
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
 !endif\r

-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r

 __DEBUGINFO =\r
 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r


@@ -188,23 +218,27 @@ __EXCEPTIONSFLAG = -xs
 __WXLIB_NET_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_NET_p = &\r
 __WXLIB_NET_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_NET_p = &\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib

 !endif\r
 __WXLIB_XML_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_XML_p = &\r
 !endif\r
 __WXLIB_XML_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_XML_p = &\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib

 !endif\r
 __WXLIB_BASE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_BASE_p = &\r
 !endif\r
 __WXLIB_BASE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_BASE_p = &\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif\r
 __WXLIB_MONO_p =\r
 !ifeq MONOLITHIC 1\r
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 !endif\r
 __WXLIB_MONO_p =\r
 !ifeq MONOLITHIC 1\r
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

+__LIB_PNG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r

 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r


@@ -258,18 +292,19 @@ __DLLFLAG_p = -dWXUSINGDLL
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = &\r
+       .\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r

 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r

-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &\r
-       /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
+       $(__RUNTIME_LIBS) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 &
+       $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 TEST_OBJECTS =  &\r
        $(OBJS)\test_dummy.obj &\r
        $(OBJS)\test_test.obj &\r
 TEST_OBJECTS =  &\r
        $(OBJS)\test_dummy.obj &\r
        $(OBJS)\test_test.obj &\r


@@ -319,6 +354,7 @@ TEST_OBJECTS =  &
        $(OBJS)\test_wxregextest.obj &\r
        $(OBJS)\test_scopeguardtest.obj &\r
        $(OBJS)\test_iostream.obj &\r
        $(OBJS)\test_wxregextest.obj &\r
        $(OBJS)\test_scopeguardtest.obj &\r
        $(OBJS)\test_iostream.obj &\r

+       $(OBJS)\test_numformatter.obj &\r

        $(OBJS)\test_strings.obj &\r
        $(OBJS)\test_stdstrings.obj &\r
        $(OBJS)\test_tokenizer.obj &\r
        $(OBJS)\test_strings.obj &\r
        $(OBJS)\test_stdstrings.obj &\r
        $(OBJS)\test_tokenizer.obj &\r


@@ -355,78 +391,98 @@ TEST_OBJECTS =  &
        $(OBJS)\test_xlocale.obj &\r
        $(OBJS)\test_xmltest.obj\r
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(OBJS)\test_xlocale.obj &\r
        $(OBJS)\test_xmltest.obj\r
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r

-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $(CPPUNIT_CFLAGS) &\r
-       /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__RUNTIME_LIBS) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH &
+       $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 TEST_GUI_OBJECTS =  &\r
        $(OBJS)\test_gui_dummy.obj &\r
 TEST_GUI_OBJECTS =  &\r
        $(OBJS)\test_gui_dummy.obj &\r

-       $(OBJS)\test_gui_asserthelper.obj &
+       $(OBJS)\test_gui_asserthelper.obj &\r

        $(OBJS)\test_gui_test.obj &\r
        $(OBJS)\test_gui_test.obj &\r

-       $(OBJS)\test_gui_testableframe.obj &
+       $(OBJS)\test_gui_testableframe.obj &\r

        $(OBJS)\test_gui_rect.obj &\r
        $(OBJS)\test_gui_size.obj &\r
        $(OBJS)\test_gui_point.obj &\r
        $(OBJS)\test_gui_rect.obj &\r
        $(OBJS)\test_gui_size.obj &\r
        $(OBJS)\test_gui_point.obj &\r

+       $(OBJS)\test_gui_region.obj &\r

        $(OBJS)\test_gui_bitmap.obj &\r
        $(OBJS)\test_gui_colour.obj &\r
        $(OBJS)\test_gui_ellipsization.obj &\r
        $(OBJS)\test_gui_measuring.obj &\r
        $(OBJS)\test_gui_bitmap.obj &\r
        $(OBJS)\test_gui_colour.obj &\r
        $(OBJS)\test_gui_ellipsization.obj &\r
        $(OBJS)\test_gui_measuring.obj &\r

+       $(OBJS)\test_gui_affinematrix.obj &\r

        $(OBJS)\test_gui_config.obj &\r
        $(OBJS)\test_gui_config.obj &\r

-       $(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 &\r
+       $(OBJS)\test_gui_bitmaptogglebuttontest.obj &\r
+       $(OBJS)\test_gui_bookctrlbasetest.obj &\r
+       $(OBJS)\test_gui_buttontest.obj &\r
+       $(OBJS)\test_gui_checkboxtest.obj &\r
+       $(OBJS)\test_gui_checklistboxtest.obj &\r
+       $(OBJS)\test_gui_choicebooktest.obj &\r
+       $(OBJS)\test_gui_choicetest.obj &\r

        $(OBJS)\test_gui_comboboxtest.obj &\r
        $(OBJS)\test_gui_comboboxtest.obj &\r

-       $(OBJS)\test_gui_frametest.obj &
-       $(OBJS)\test_gui_gaugetest.obj &
-       $(OBJS)\test_gui_gridtest.obj &
+       $(OBJS)\test_gui_dataviewctrltest.obj &\r
+       $(OBJS)\test_gui_datepickerctrltest.obj &\r
+       $(OBJS)\test_gui_frametest.obj &\r
+       $(OBJS)\test_gui_gaugetest.obj &\r
+       $(OBJS)\test_gui_gridtest.obj &\r

        $(OBJS)\test_gui_headerctrltest.obj &\r
        $(OBJS)\test_gui_headerctrltest.obj &\r

-       $(OBJS)\test_gui_hyperlinkctrltest.obj &
-       $(OBJS)\test_gui_itemcontainertest.obj &
+       $(OBJS)\test_gui_htmllboxtest.obj &\r
+       $(OBJS)\test_gui_hyperlinkctrltest.obj &\r
+       $(OBJS)\test_gui_itemcontainertest.obj &\r

        $(OBJS)\test_gui_label.obj &\r
        $(OBJS)\test_gui_label.obj &\r

-       $(OBJS)\test_gui_listbasetest.obj &
-       $(OBJS)\test_gui_listbooktest.obj &
-       $(OBJS)\test_gui_listboxtest.obj &
+       $(OBJS)\test_gui_listbasetest.obj &\r
+       $(OBJS)\test_gui_listbooktest.obj &\r
+       $(OBJS)\test_gui_listboxtest.obj &\r

        $(OBJS)\test_gui_listctrltest.obj &\r
        $(OBJS)\test_gui_listctrltest.obj &\r

-       $(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 &\r
+       $(OBJS)\test_gui_markuptest.obj &\r
+       $(OBJS)\test_gui_notebooktest.obj &\r
+       $(OBJS)\test_gui_ownerdrawncomboboxtest.obj &\r
+       $(OBJS)\test_gui_pickerbasetest.obj &\r
+       $(OBJS)\test_gui_pickertest.obj &\r
+       $(OBJS)\test_gui_radioboxtest.obj &\r
+       $(OBJS)\test_gui_radiobuttontest.obj &\r
+       $(OBJS)\test_gui_rearrangelisttest.obj &\r
+       $(OBJS)\test_gui_richtextctrltest.obj &\r
+       $(OBJS)\test_gui_searchctrltest.obj &
+       $(OBJS)\test_gui_slidertest.obj &\r
+       $(OBJS)\test_gui_spinctrldbltest.obj &\r
+       $(OBJS)\test_gui_spinctrltest.obj &\r

        $(OBJS)\test_gui_textctrltest.obj &\r
        $(OBJS)\test_gui_textentrytest.obj &\r
        $(OBJS)\test_gui_textctrltest.obj &\r
        $(OBJS)\test_gui_textentrytest.obj &\r

-       $(OBJS)\test_gui_togglebuttontest.obj &
-       $(OBJS)\test_gui_toolbooktest.obj &
-       $(OBJS)\test_gui_treebooktest.obj &
+       $(OBJS)\test_gui_togglebuttontest.obj &\r
+       $(OBJS)\test_gui_toolbooktest.obj &\r
+       $(OBJS)\test_gui_treebooktest.obj &\r

        $(OBJS)\test_gui_treectrltest.obj &\r
        $(OBJS)\test_gui_treectrltest.obj &\r

-       $(OBJS)\test_gui_windowtest.obj &
+       $(OBJS)\test_gui_treelistctrltest.obj &\r
+       $(OBJS)\test_gui_virtlistctrltest.obj &\r
+       $(OBJS)\test_gui_webtest.obj &\r
+       $(OBJS)\test_gui_windowtest.obj &\r
+       $(OBJS)\test_gui_dialogtest.obj &\r

        $(OBJS)\test_gui_clone.obj &\r
        $(OBJS)\test_gui_propagation.obj &\r
        $(OBJS)\test_gui_clone.obj &\r
        $(OBJS)\test_gui_propagation.obj &\r

+       $(OBJS)\test_gui_keyboard.obj &\r

        $(OBJS)\test_gui_fonttest.obj &\r
        $(OBJS)\test_gui_image.obj &\r
        $(OBJS)\test_gui_rawbmp.obj &\r
        $(OBJS)\test_gui_fonttest.obj &\r
        $(OBJS)\test_gui_image.obj &\r
        $(OBJS)\test_gui_rawbmp.obj &\r

+       $(OBJS)\test_gui_htmlparser.obj &\r

        $(OBJS)\test_gui_htmlwindow.obj &\r
        $(OBJS)\test_gui_htmlwindow.obj &\r

+       $(OBJS)\test_gui_accelentry.obj &\r
+       $(OBJS)\test_gui_menu.obj &\r

        $(OBJS)\test_gui_guifuncs.obj &\r
        $(OBJS)\test_gui_selstoretest.obj &\r
        $(OBJS)\test_gui_garbage.obj &\r
        $(OBJS)\test_gui_settings.obj &\r
        $(OBJS)\test_gui_socket.obj &\r
        $(OBJS)\test_gui_boxsizer.obj &\r
        $(OBJS)\test_gui_guifuncs.obj &\r
        $(OBJS)\test_gui_selstoretest.obj &\r
        $(OBJS)\test_gui_garbage.obj &\r
        $(OBJS)\test_gui_settings.obj &\r
        $(OBJS)\test_gui_socket.obj &\r
        $(OBJS)\test_gui_boxsizer.obj &\r

+       $(OBJS)\test_gui_wrapsizer.obj &\r
+       $(OBJS)\test_gui_toplevel.obj &\r
+       $(OBJS)\test_gui_valnum.obj &\r

        $(OBJS)\test_gui_clientsize.obj &\r
        $(OBJS)\test_gui_clientsize.obj &\r

-       $(OBJS)\test_gui_setsize.obj\r
+       $(OBJS)\test_gui_setsize.obj &\r
+       $(OBJS)\test_gui_xrctest.obj\r

 \r
 \r
 all : $(OBJS)\r
 \r
 \r
 all : $(OBJS)\r


@@ -435,7 +491,7 @@ $(OBJS) :
 \r
 ### Targets: ###\r
 \r
 \r
 ### Targets: ###\r
 \r

-all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data fr\r
+all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data data-images fr\r

 \r
 clean : .SYMBOLIC \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
 \r
 clean : .SYMBOLIC \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r


@@ -453,7 +509,7 @@ $(OBJS)\test.exe :  $(TEST_OBJECTS)
        @%append $(OBJS)\test.lbc option caseexact\r
        @%append $(OBJS)\test.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i\r
        @%append $(OBJS)\test.lbc option caseexact\r
        @%append $(OBJS)\test.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i\r

-       @for %i in ( $(__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)  $(__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.lbc library %i\r
+       @for %i in ( $(__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)  $(__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.lbc library %i\r

        @%append $(OBJS)\test.lbc\r
        @for %i in () do @%append $(OBJS)\test.lbc option stack=%i\r
        wlink @$(OBJS)\test.lbc\r
        @%append $(OBJS)\test.lbc\r
        @for %i in () do @%append $(OBJS)\test.lbc option stack=%i\r
        wlink @$(OBJS)\test.lbc\r


@@ -466,7 +522,7 @@ $(OBJS)\test_gui.exe :  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
        @%append $(OBJS)\test_gui.lbc option caseexact\r
        @%append $(OBJS)\test_gui.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i\r
        @%append $(OBJS)\test_gui.lbc option caseexact\r
        @%append $(OBJS)\test_gui.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i\r

-       @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_WEBVIEW_p) $(__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) $(LIB_GTK)  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\r
        @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i\r
        wlink @$(OBJS)\test_gui.lbc\r
        @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res\r
        @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i\r
        wlink @$(OBJS)\test_gui.lbc\r


@@ -476,6 +532,10 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+data-images : .SYMBOLIC \r
+       if not exist image mkdir image\r
+       for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%f copy .\image\%f image\r
+\r

 fr : .SYMBOLIC \r
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr\r
        for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr\r
 fr : .SYMBOLIC \r
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr\r
        for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr\r


@@ -624,6 +684,9 @@ $(OBJS)\test_scopeguardtest.obj :  .AUTODEPEND .\scopeguard\scopeguardtest.cpp
 $(OBJS)\test_iostream.obj :  .AUTODEPEND .\strings\iostream.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_iostream.obj :  .AUTODEPEND .\strings\iostream.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_numformatter.obj :  .AUTODEPEND .\strings\numformatter.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_strings.obj :  .AUTODEPEND .\strings\strings.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_strings.obj :  .AUTODEPEND .\strings\strings.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r


@@ -730,20 +793,20 @@ $(OBJS)\test_xmltest.obj :  .AUTODEPEND .\xml\xmltest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc\r

-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<

 \r
 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 \r
 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_asserthelper.obj :  .AUTODEPEND .\asserthelper.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_asserthelper.obj :  .AUTODEPEND .\asserthelper.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_test.obj :  .AUTODEPEND .\test.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_test.obj :  .AUTODEPEND .\test.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_testableframe.obj :  .AUTODEPEND .\testableframe.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_testableframe.obj :  .AUTODEPEND .\testableframe.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_rect.obj :  .AUTODEPEND .\geometry\rect.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_rect.obj :  .AUTODEPEND .\geometry\rect.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r


@@ -753,6 +816,9 @@ $(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
 $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_region.obj :  .AUTODEPEND .\geometry\region.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_bitmap.obj :  .AUTODEPEND .\graphics\bitmap.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_bitmap.obj :  .AUTODEPEND .\graphics\bitmap.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r


@@ -765,129 +831,165 @@ $(OBJS)\test_gui_ellipsization.obj :  .AUTODEPEND .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_affinematrix.obj :  .AUTODEPEND .\graphics\affinematrix.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_config.obj :  .AUTODEPEND .\config\config.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_config.obj :  .AUTODEPEND .\config\config.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_bitmapcomboboxtest.obj :  .AUTODEPEND .\controls\bitmapcomboboxtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_bitmaptogglebuttontest.obj :  .AUTODEPEND .\controls\bitmaptogglebuttontest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_bookctrlbasetest.obj :  .AUTODEPEND .\controls\bookctrlbasetest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_buttontest.obj :  .AUTODEPEND .\controls\buttontest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_checkboxtest.obj :  .AUTODEPEND .\controls\checkboxtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_checklistboxtest.obj :  .AUTODEPEND .\controls\checklistboxtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_choicebooktest.obj :  .AUTODEPEND .\controls\choicebooktest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_choicetest.obj :  .AUTODEPEND .\controls\choicetest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_bitmapcomboboxtest.obj :  .AUTODEPEND .\controls\bitmapcomboboxtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_bitmaptogglebuttontest.obj :  .AUTODEPEND .\controls\bitmaptogglebuttontest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_bookctrlbasetest.obj :  .AUTODEPEND .\controls\bookctrlbasetest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_buttontest.obj :  .AUTODEPEND .\controls\buttontest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_checkboxtest.obj :  .AUTODEPEND .\controls\checkboxtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_checklistboxtest.obj :  .AUTODEPEND .\controls\checklistboxtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_choicebooktest.obj :  .AUTODEPEND .\controls\choicebooktest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_choicetest.obj :  .AUTODEPEND .\controls\choicetest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_comboboxtest.obj :  .AUTODEPEND .\controls\comboboxtest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_comboboxtest.obj :  .AUTODEPEND .\controls\comboboxtest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_frametest.obj :  .AUTODEPEND .\controls\frametest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_gaugetest.obj :  .AUTODEPEND .\controls\gaugetest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_gridtest.obj :  .AUTODEPEND .\controls\gridtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_dataviewctrltest.obj :  .AUTODEPEND .\controls\dataviewctrltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_datepickerctrltest.obj :  .AUTODEPEND .\controls\datepickerctrltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_frametest.obj :  .AUTODEPEND .\controls\frametest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_gaugetest.obj :  .AUTODEPEND .\controls\gaugetest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_gridtest.obj :  .AUTODEPEND .\controls\gridtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_headerctrltest.obj :  .AUTODEPEND .\controls\headerctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_headerctrltest.obj :  .AUTODEPEND .\controls\headerctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_hyperlinkctrltest.obj :  .AUTODEPEND .\controls\hyperlinkctrltest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_itemcontainertest.obj :  .AUTODEPEND .\controls\itemcontainertest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_htmllboxtest.obj :  .AUTODEPEND .\controls\htmllboxtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_hyperlinkctrltest.obj :  .AUTODEPEND .\controls\hyperlinkctrltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_itemcontainertest.obj :  .AUTODEPEND .\controls\itemcontainertest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_label.obj :  .AUTODEPEND .\controls\label.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_label.obj :  .AUTODEPEND .\controls\label.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_listbasetest.obj :  .AUTODEPEND .\controls\listbasetest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_listbooktest.obj :  .AUTODEPEND .\controls\listbooktest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_listboxtest.obj :  .AUTODEPEND .\controls\listboxtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_listbasetest.obj :  .AUTODEPEND .\controls\listbasetest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_listbooktest.obj :  .AUTODEPEND .\controls\listbooktest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_listboxtest.obj :  .AUTODEPEND .\controls\listboxtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_listctrltest.obj :  .AUTODEPEND .\controls\listctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_listctrltest.obj :  .AUTODEPEND .\controls\listctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_listviewtest.obj :  .AUTODEPEND .\controls\listviewtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_notebooktest.obj :  .AUTODEPEND .\controls\notebooktest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_pickerbasetest.obj :  .AUTODEPEND .\controls\pickerbasetest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_pickertest.obj :  .AUTODEPEND .\controls\pickertest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_radioboxtest.obj :  .AUTODEPEND .\controls\radioboxtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_radiobuttontest.obj :  .AUTODEPEND .\controls\radiobuttontest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_rearrangelisttest.obj :  .AUTODEPEND .\controls\rearrangelisttest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_richtextctrltest.obj :  .AUTODEPEND .\controls\richtextctrltest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_slidertest.obj :  .AUTODEPEND .\controls\slidertest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_spinctrldbltest.obj :  .AUTODEPEND .\controls\spinctrldbltest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_spinctrltest.obj :  .AUTODEPEND .\controls\spinctrltest.cpp
+$(OBJS)\test_gui_listviewtest.obj :  .AUTODEPEND .\controls\listviewtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_markuptest.obj :  .AUTODEPEND .\controls\markuptest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_notebooktest.obj :  .AUTODEPEND .\controls\notebooktest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_ownerdrawncomboboxtest.obj :  .AUTODEPEND .\controls\ownerdrawncomboboxtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_pickerbasetest.obj :  .AUTODEPEND .\controls\pickerbasetest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_pickertest.obj :  .AUTODEPEND .\controls\pickertest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_radioboxtest.obj :  .AUTODEPEND .\controls\radioboxtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_radiobuttontest.obj :  .AUTODEPEND .\controls\radiobuttontest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_rearrangelisttest.obj :  .AUTODEPEND .\controls\rearrangelisttest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_richtextctrltest.obj :  .AUTODEPEND .\controls\richtextctrltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_searchctrltest.obj :  .AUTODEPEND .\controls\searchctrltest.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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_spinctrldbltest.obj :  .AUTODEPEND .\controls\spinctrldbltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_spinctrltest.obj :  .AUTODEPEND .\controls\spinctrltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_textctrltest.obj :  .AUTODEPEND .\controls\textctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_textentrytest.obj :  .AUTODEPEND .\controls\textentrytest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_textctrltest.obj :  .AUTODEPEND .\controls\textctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_textentrytest.obj :  .AUTODEPEND .\controls\textentrytest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_togglebuttontest.obj :  .AUTODEPEND .\controls\togglebuttontest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_toolbooktest.obj :  .AUTODEPEND .\controls\toolbooktest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_treebooktest.obj :  .AUTODEPEND .\controls\treebooktest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_togglebuttontest.obj :  .AUTODEPEND .\controls\togglebuttontest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_toolbooktest.obj :  .AUTODEPEND .\controls\toolbooktest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_treebooktest.obj :  .AUTODEPEND .\controls\treebooktest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_treectrltest.obj :  .AUTODEPEND .\controls\treectrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_treectrltest.obj :  .AUTODEPEND .\controls\treectrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_gui_windowtest.obj :  .AUTODEPEND .\controls\windowtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_treelistctrltest.obj :  .AUTODEPEND .\controls\treelistctrltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_virtlistctrltest.obj :  .AUTODEPEND .\controls\virtlistctrltest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_webtest.obj :  .AUTODEPEND .\controls\webtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_windowtest.obj :  .AUTODEPEND .\controls\windowtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_dialogtest.obj :  .AUTODEPEND .\controls\dialogtest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_clone.obj :  .AUTODEPEND .\events\clone.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_propagation.obj :  .AUTODEPEND .\events\propagation.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_clone.obj :  .AUTODEPEND .\events\clone.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_propagation.obj :  .AUTODEPEND .\events\propagation.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_keyboard.obj :  .AUTODEPEND .\events\keyboard.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_fonttest.obj :  .AUTODEPEND .\font\fonttest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_fonttest.obj :  .AUTODEPEND .\font\fonttest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r


@@ -897,9 +999,18 @@ $(OBJS)\test_gui_image.obj :  .AUTODEPEND .\image\image.cpp
 $(OBJS)\test_gui_rawbmp.obj :  .AUTODEPEND .\image\rawbmp.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_rawbmp.obj :  .AUTODEPEND .\image\rawbmp.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_htmlparser.obj :  .AUTODEPEND .\html\htmlparser.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_htmlwindow.obj :  .AUTODEPEND .\html\htmlwindow.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_htmlwindow.obj :  .AUTODEPEND .\html\htmlwindow.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_accelentry.obj :  .AUTODEPEND .\menu\accelentry.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_menu.obj :  .AUTODEPEND .\menu\menu.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_guifuncs.obj :  .AUTODEPEND .\misc\guifuncs.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_guifuncs.obj :  .AUTODEPEND .\misc\guifuncs.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r


@@ -918,9 +1029,21 @@ $(OBJS)\test_gui_socket.obj :  .AUTODEPEND .\net\socket.cpp
 $(OBJS)\test_gui_boxsizer.obj :  .AUTODEPEND .\sizers\boxsizer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_boxsizer.obj :  .AUTODEPEND .\sizers\boxsizer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_wrapsizer.obj :  .AUTODEPEND .\sizers\wrapsizer.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_toplevel.obj :  .AUTODEPEND .\toplevel\toplevel.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_valnum.obj :  .AUTODEPEND .\validators\valnum.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r

 $(OBJS)\test_gui_clientsize.obj :  .AUTODEPEND .\window\clientsize.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_setsize.obj :  .AUTODEPEND .\window\setsize.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_clientsize.obj :  .AUTODEPEND .\window\clientsize.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_setsize.obj :  .AUTODEPEND .\window\setsize.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

+$(OBJS)\test_gui_xrctest.obj :  .AUTODEPEND .\xml\xrctest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r