Correct wxDatePickerCtrl::GetValue() documentation and other minor fixes.

[wxWidgets.git] / build / msw / makefile.wat

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index d27edd2b75fadfb5f36b9b301f45086ff3ee4a3d..75e6d3b581314c808cd40ba314af79668765dd4e 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -135,9 +135,13 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_styleparams.obj &\r
        $(OBJS)\monodll_winpars.obj &\r
        $(OBJS)\monodll_htmllbox.obj &\r
+       $(OBJS)\monodll_webview_ie.obj &\r
+       $(OBJS)\monodll_webview.obj &\r
+       $(OBJS)\monodll_webviewarchivehandler.obj &\r
        $(OBJS)\monodll_debugrpt.obj &\r
        $(OBJS)\monodll_dbgrptg.obj &\r
        $(OBJS)\monodll_xh_animatctrl.obj &\r
+       $(OBJS)\monodll_xh_bannerwindow.obj &\r
        $(OBJS)\monodll_xh_bmp.obj &\r
        $(OBJS)\monodll_xh_bmpcbox.obj &\r
        $(OBJS)\monodll_xh_bmpbt.obj &\r
@@ -222,18 +226,18 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_ribbon_control.obj &\r
        $(OBJS)\monodll_gallery.obj &\r
        $(OBJS)\monodll_page.obj &\r
-       $(OBJS)\monodll_ribbon_panel.obj &
+       $(OBJS)\monodll_ribbon_panel.obj &\r
        $(OBJS)\monodll_ribbon_toolbar.obj &\r
-       $(OBJS)\monodll_richtextctrl.obj &\r
        $(OBJS)\monodll_richtextbuffer.obj &\r
-       $(OBJS)\monodll_richtextstyles.obj &\r
-       $(OBJS)\monodll_richtextxml.obj &\r
-       $(OBJS)\monodll_richtexthtml.obj &\r
+       $(OBJS)\monodll_richtextctrl.obj &\r
        $(OBJS)\monodll_richtextformatdlg.obj &\r
-       $(OBJS)\monodll_richtextsymboldlg.obj &\r
-       $(OBJS)\monodll_richtextstyledlg.obj &\r
-       $(OBJS)\monodll_richtextprint.obj &\r
+       $(OBJS)\monodll_richtexthtml.obj &\r
        $(OBJS)\monodll_richtextimagedlg.obj &\r
+       $(OBJS)\monodll_richtextprint.obj &\r
+       $(OBJS)\monodll_richtextstyledlg.obj &\r
+       $(OBJS)\monodll_richtextstyles.obj &\r
+       $(OBJS)\monodll_richtextsymboldlg.obj &\r
+       $(OBJS)\monodll_richtextxml.obj &\r
        $(OBJS)\monodll_stc.obj &\r
        $(OBJS)\monodll_PlatWX.obj &\r
        $(OBJS)\monodll_ScintillaWX.obj\r
@@ -275,7 +279,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_droptgt.obj &\r
        $(OBJS)\monodll_oleutils.obj &\r
        $(OBJS)\monodll_palette.obj &\r
-       $(OBJS)\monodll_msw_panel.obj &
        $(OBJS)\monodll_pen.obj &\r
        $(OBJS)\monodll_popupwin.obj &\r
        $(OBJS)\monodll_printdlg.obj &\r
@@ -285,7 +288,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_settings.obj &\r
        $(OBJS)\monodll_tooltip.obj &\r
        $(OBJS)\monodll_toplevel.obj &\r
-       $(OBJS)\monodll_uiaction.obj &
+       $(OBJS)\monodll_uiaction.obj &\r
        $(OBJS)\monodll_utilsgui.obj &\r
        $(OBJS)\monodll_uxtheme.obj &\r
        $(OBJS)\monodll_window.obj &\r
@@ -300,6 +303,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_generic_statusbr.obj &\r
        $(OBJS)\monodll_prntdlgg.obj &\r
        $(OBJS)\monodll_msw_accel.obj &\r
+       $(OBJS)\monodll_anybutton.obj &\r
        $(OBJS)\monodll_artmsw.obj &\r
        $(OBJS)\monodll_msw_bmpbuttn.obj &\r
        $(OBJS)\monodll_msw_button.obj &\r
@@ -329,6 +333,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_msw_notebook.obj &\r
        $(OBJS)\monodll_access.obj &\r
        $(OBJS)\monodll_ownerdrw.obj &\r
+       $(OBJS)\monodll_msw_panel.obj &\r
        $(OBJS)\monodll_progdlg.obj &\r
        $(OBJS)\monodll_msw_radiobox.obj &\r
        $(OBJS)\monodll_msw_radiobut.obj &\r
@@ -353,6 +358,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_accelcmn.obj &\r
        $(OBJS)\monodll_accesscmn.obj &\r
        $(OBJS)\monodll_anidecod.obj &\r
+       $(OBJS)\monodll_affinematrix2d.obj &\r
        $(OBJS)\monodll_appcmn.obj &\r
        $(OBJS)\monodll_artprov.obj &\r
        $(OBJS)\monodll_artstd.obj &\r
@@ -428,7 +434,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_layout.obj &\r
        $(OBJS)\monodll_lboxcmn.obj &\r
        $(OBJS)\monodll_listctrlcmn.obj &\r
-       $(OBJS)\monodll_markupparser.obj &
+       $(OBJS)\monodll_markupparser.obj &\r
        $(OBJS)\monodll_matrix.obj &\r
        $(OBJS)\monodll_menucmn.obj &\r
        $(OBJS)\monodll_mousemanager.obj &\r
@@ -487,13 +493,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_infobar.obj &\r
        $(OBJS)\monodll_listbkg.obj &\r
        $(OBJS)\monodll_logg.obj &\r
-       $(OBJS)\monodll_markuptext.obj &
-       $(OBJS)\monodll_msgdlgg.obj &
-       $(OBJS)\monodll_numdlgg.obj &
-       $(OBJS)\monodll_panelg.obj &
-       $(OBJS)\monodll_progdlgg.obj &
-       $(OBJS)\monodll_printps.obj &
-       $(OBJS)\monodll_renderg.obj &
+       $(OBJS)\monodll_markuptext.obj &\r
+       $(OBJS)\monodll_msgdlgg.obj &\r
+       $(OBJS)\monodll_numdlgg.obj &\r
+       $(OBJS)\monodll_panelg.obj &\r
+       $(OBJS)\monodll_progdlgg.obj &\r
+       $(OBJS)\monodll_printps.obj &\r
+       $(OBJS)\monodll_renderg.obj &\r
        $(OBJS)\monodll_richmsgdlgg.obj &\r
        $(OBJS)\monodll_scrlwing.obj &\r
        $(OBJS)\monodll_selstore.obj &\r
@@ -547,7 +553,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_droptgt.obj &\r
        $(OBJS)\monodll_oleutils.obj &\r
        $(OBJS)\monodll_palette.obj &\r
-       $(OBJS)\monodll_msw_panel.obj &
        $(OBJS)\monodll_pen.obj &\r
        $(OBJS)\monodll_popupwin.obj &\r
        $(OBJS)\monodll_printdlg.obj &\r
@@ -557,7 +562,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_settings.obj &\r
        $(OBJS)\monodll_tooltip.obj &\r
        $(OBJS)\monodll_toplevel.obj &\r
-       $(OBJS)\monodll_uiaction.obj &
+       $(OBJS)\monodll_uiaction.obj &\r
        $(OBJS)\monodll_utilsgui.obj &\r
        $(OBJS)\monodll_uxtheme.obj &\r
        $(OBJS)\monodll_window.obj &\r
@@ -621,6 +626,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_accelcmn.obj &\r
        $(OBJS)\monodll_accesscmn.obj &\r
        $(OBJS)\monodll_anidecod.obj &\r
+       $(OBJS)\monodll_affinematrix2d.obj &\r
        $(OBJS)\monodll_appcmn.obj &\r
        $(OBJS)\monodll_artprov.obj &\r
        $(OBJS)\monodll_artstd.obj &\r
@@ -696,7 +702,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_layout.obj &\r
        $(OBJS)\monodll_lboxcmn.obj &\r
        $(OBJS)\monodll_listctrlcmn.obj &\r
-       $(OBJS)\monodll_markupparser.obj &
+       $(OBJS)\monodll_markupparser.obj &\r
        $(OBJS)\monodll_matrix.obj &\r
        $(OBJS)\monodll_menucmn.obj &\r
        $(OBJS)\monodll_mousemanager.obj &\r
@@ -755,13 +761,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_infobar.obj &\r
        $(OBJS)\monodll_listbkg.obj &\r
        $(OBJS)\monodll_logg.obj &\r
-       $(OBJS)\monodll_markuptext.obj &
-       $(OBJS)\monodll_msgdlgg.obj &
-       $(OBJS)\monodll_numdlgg.obj &
-       $(OBJS)\monodll_panelg.obj &
-       $(OBJS)\monodll_progdlgg.obj &
-       $(OBJS)\monodll_printps.obj &
-       $(OBJS)\monodll_renderg.obj &
+       $(OBJS)\monodll_markuptext.obj &\r
+       $(OBJS)\monodll_msgdlgg.obj &\r
+       $(OBJS)\monodll_numdlgg.obj &\r
+       $(OBJS)\monodll_panelg.obj &\r
+       $(OBJS)\monodll_progdlgg.obj &\r
+       $(OBJS)\monodll_printps.obj &\r
+       $(OBJS)\monodll_renderg.obj &\r
        $(OBJS)\monodll_richmsgdlgg.obj &\r
        $(OBJS)\monodll_scrlwing.obj &\r
        $(OBJS)\monodll_selstore.obj &\r
@@ -790,6 +796,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_hyperlnkcmn.obj &\r
        $(OBJS)\monodll_odcombocmn.obj &\r
        $(OBJS)\monodll_aboutdlgg.obj &\r
+       $(OBJS)\monodll_bannerwindow.obj &\r
        $(OBJS)\monodll_bmpcboxg.obj &\r
        $(OBJS)\monodll_calctrlg.obj &\r
        $(OBJS)\monodll_commandlinkbuttong.obj &\r
@@ -809,10 +816,10 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_sashwin.obj &\r
        $(OBJS)\monodll_splash.obj &\r
        $(OBJS)\monodll_tipdlg.obj &\r
+       $(OBJS)\monodll_treelist.obj &\r
        $(OBJS)\monodll_wizard.obj &\r
        $(OBJS)\monodll_taskbarcmn.obj &\r
        $(OBJS)\monodll_aboutdlg.obj &\r
-       $(OBJS)\monodll_hyperlink.obj &\r
        $(OBJS)\monodll_notifmsg.obj &\r
        $(OBJS)\monodll_sound.obj &\r
        $(OBJS)\monodll_taskbar.obj &\r
@@ -822,7 +829,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_calctrl.obj &\r
        $(OBJS)\monodll_commandlinkbutton.obj &\r
        $(OBJS)\monodll_datecontrols.obj &\r
-       $(OBJS)\monodll_datectrl.obj\r
+       $(OBJS)\monodll_datectrl.obj &\r
+       $(OBJS)\monodll_datetimectrl.obj &
+       $(OBJS)\monodll_hyperlink.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &\r
@@ -834,6 +843,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_hyperlnkcmn.obj &\r
        $(OBJS)\monodll_odcombocmn.obj &\r
        $(OBJS)\monodll_aboutdlgg.obj &\r
+       $(OBJS)\monodll_bannerwindow.obj &\r
        $(OBJS)\monodll_bmpcboxg.obj &\r
        $(OBJS)\monodll_calctrlg.obj &\r
        $(OBJS)\monodll_commandlinkbuttong.obj &\r
@@ -853,10 +863,10 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_sashwin.obj &\r
        $(OBJS)\monodll_splash.obj &\r
        $(OBJS)\monodll_tipdlg.obj &\r
+       $(OBJS)\monodll_treelist.obj &\r
        $(OBJS)\monodll_wizard.obj &\r
        $(OBJS)\monodll_taskbarcmn.obj &\r
        $(OBJS)\monodll_aboutdlg.obj &\r
-       $(OBJS)\monodll_hyperlink.obj &\r
        $(OBJS)\monodll_notifmsg.obj &\r
        $(OBJS)\monodll_sound.obj &\r
        $(OBJS)\monodll_taskbar.obj &\r
@@ -909,9 +919,13 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_styleparams.obj &\r
        $(OBJS)\monolib_winpars.obj &\r
        $(OBJS)\monolib_htmllbox.obj &\r
+       $(OBJS)\monolib_webview_ie.obj &\r
+       $(OBJS)\monolib_webview.obj &\r
+       $(OBJS)\monolib_webviewarchivehandler.obj &\r
        $(OBJS)\monolib_debugrpt.obj &\r
        $(OBJS)\monolib_dbgrptg.obj &\r
        $(OBJS)\monolib_xh_animatctrl.obj &\r
+       $(OBJS)\monolib_xh_bannerwindow.obj &\r
        $(OBJS)\monolib_xh_bmp.obj &\r
        $(OBJS)\monolib_xh_bmpcbox.obj &\r
        $(OBJS)\monolib_xh_bmpbt.obj &\r
@@ -996,18 +1010,18 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_ribbon_control.obj &\r
        $(OBJS)\monolib_gallery.obj &\r
        $(OBJS)\monolib_page.obj &\r
-       $(OBJS)\monolib_ribbon_panel.obj &
+       $(OBJS)\monolib_ribbon_panel.obj &\r
        $(OBJS)\monolib_ribbon_toolbar.obj &\r
-       $(OBJS)\monolib_richtextctrl.obj &\r
        $(OBJS)\monolib_richtextbuffer.obj &\r
-       $(OBJS)\monolib_richtextstyles.obj &\r
-       $(OBJS)\monolib_richtextxml.obj &\r
-       $(OBJS)\monolib_richtexthtml.obj &\r
+       $(OBJS)\monolib_richtextctrl.obj &\r
        $(OBJS)\monolib_richtextformatdlg.obj &\r
-       $(OBJS)\monolib_richtextsymboldlg.obj &\r
-       $(OBJS)\monolib_richtextstyledlg.obj &\r
-       $(OBJS)\monolib_richtextprint.obj &\r
+       $(OBJS)\monolib_richtexthtml.obj &\r
        $(OBJS)\monolib_richtextimagedlg.obj &\r
+       $(OBJS)\monolib_richtextprint.obj &\r
+       $(OBJS)\monolib_richtextstyledlg.obj &\r
+       $(OBJS)\monolib_richtextstyles.obj &\r
+       $(OBJS)\monolib_richtextsymboldlg.obj &\r
+       $(OBJS)\monolib_richtextxml.obj &\r
        $(OBJS)\monolib_stc.obj &\r
        $(OBJS)\monolib_PlatWX.obj &\r
        $(OBJS)\monolib_ScintillaWX.obj\r
@@ -1049,7 +1063,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_droptgt.obj &\r
        $(OBJS)\monolib_oleutils.obj &\r
        $(OBJS)\monolib_palette.obj &\r
-       $(OBJS)\monolib_msw_panel.obj &
        $(OBJS)\monolib_pen.obj &\r
        $(OBJS)\monolib_popupwin.obj &\r
        $(OBJS)\monolib_printdlg.obj &\r
@@ -1059,7 +1072,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_settings.obj &\r
        $(OBJS)\monolib_tooltip.obj &\r
        $(OBJS)\monolib_toplevel.obj &\r
-       $(OBJS)\monolib_uiaction.obj &
+       $(OBJS)\monolib_uiaction.obj &\r
        $(OBJS)\monolib_utilsgui.obj &\r
        $(OBJS)\monolib_uxtheme.obj &\r
        $(OBJS)\monolib_window.obj &\r
@@ -1074,6 +1087,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_generic_statusbr.obj &\r
        $(OBJS)\monolib_prntdlgg.obj &\r
        $(OBJS)\monolib_msw_accel.obj &\r
+       $(OBJS)\monolib_anybutton.obj &\r
        $(OBJS)\monolib_artmsw.obj &\r
        $(OBJS)\monolib_msw_bmpbuttn.obj &\r
        $(OBJS)\monolib_msw_button.obj &\r
@@ -1103,6 +1117,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_msw_notebook.obj &\r
        $(OBJS)\monolib_access.obj &\r
        $(OBJS)\monolib_ownerdrw.obj &\r
+       $(OBJS)\monolib_msw_panel.obj &\r
        $(OBJS)\monolib_progdlg.obj &\r
        $(OBJS)\monolib_msw_radiobox.obj &\r
        $(OBJS)\monolib_msw_radiobut.obj &\r
@@ -1127,6 +1142,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_accelcmn.obj &\r
        $(OBJS)\monolib_accesscmn.obj &\r
        $(OBJS)\monolib_anidecod.obj &\r
+       $(OBJS)\monolib_affinematrix2d.obj &\r
        $(OBJS)\monolib_appcmn.obj &\r
        $(OBJS)\monolib_artprov.obj &\r
        $(OBJS)\monolib_artstd.obj &\r
@@ -1202,7 +1218,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_layout.obj &\r
        $(OBJS)\monolib_lboxcmn.obj &\r
        $(OBJS)\monolib_listctrlcmn.obj &\r
-       $(OBJS)\monolib_markupparser.obj &
+       $(OBJS)\monolib_markupparser.obj &\r
        $(OBJS)\monolib_matrix.obj &\r
        $(OBJS)\monolib_menucmn.obj &\r
        $(OBJS)\monolib_mousemanager.obj &\r
@@ -1261,13 +1277,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_infobar.obj &\r
        $(OBJS)\monolib_listbkg.obj &\r
        $(OBJS)\monolib_logg.obj &\r
-       $(OBJS)\monolib_markuptext.obj &
-       $(OBJS)\monolib_msgdlgg.obj &
-       $(OBJS)\monolib_numdlgg.obj &
-       $(OBJS)\monolib_panelg.obj &
-       $(OBJS)\monolib_progdlgg.obj &
-       $(OBJS)\monolib_printps.obj &
-       $(OBJS)\monolib_renderg.obj &
+       $(OBJS)\monolib_markuptext.obj &\r
+       $(OBJS)\monolib_msgdlgg.obj &\r
+       $(OBJS)\monolib_numdlgg.obj &\r
+       $(OBJS)\monolib_panelg.obj &\r
+       $(OBJS)\monolib_progdlgg.obj &\r
+       $(OBJS)\monolib_printps.obj &\r
+       $(OBJS)\monolib_renderg.obj &\r
        $(OBJS)\monolib_richmsgdlgg.obj &\r
        $(OBJS)\monolib_scrlwing.obj &\r
        $(OBJS)\monolib_selstore.obj &\r
@@ -1321,7 +1337,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_droptgt.obj &\r
        $(OBJS)\monolib_oleutils.obj &\r
        $(OBJS)\monolib_palette.obj &\r
-       $(OBJS)\monolib_msw_panel.obj &
        $(OBJS)\monolib_pen.obj &\r
        $(OBJS)\monolib_popupwin.obj &\r
        $(OBJS)\monolib_printdlg.obj &\r
@@ -1331,7 +1346,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_settings.obj &\r
        $(OBJS)\monolib_tooltip.obj &\r
        $(OBJS)\monolib_toplevel.obj &\r
-       $(OBJS)\monolib_uiaction.obj &
+       $(OBJS)\monolib_uiaction.obj &\r
        $(OBJS)\monolib_utilsgui.obj &\r
        $(OBJS)\monolib_uxtheme.obj &\r
        $(OBJS)\monolib_window.obj &\r
@@ -1395,6 +1410,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_accelcmn.obj &\r
        $(OBJS)\monolib_accesscmn.obj &\r
        $(OBJS)\monolib_anidecod.obj &\r
+       $(OBJS)\monolib_affinematrix2d.obj &\r
        $(OBJS)\monolib_appcmn.obj &\r
        $(OBJS)\monolib_artprov.obj &\r
        $(OBJS)\monolib_artstd.obj &\r
@@ -1470,7 +1486,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_layout.obj &\r
        $(OBJS)\monolib_lboxcmn.obj &\r
        $(OBJS)\monolib_listctrlcmn.obj &\r
-       $(OBJS)\monolib_markupparser.obj &
+       $(OBJS)\monolib_markupparser.obj &\r
        $(OBJS)\monolib_matrix.obj &\r
        $(OBJS)\monolib_menucmn.obj &\r
        $(OBJS)\monolib_mousemanager.obj &\r
@@ -1529,13 +1545,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_infobar.obj &\r
        $(OBJS)\monolib_listbkg.obj &\r
        $(OBJS)\monolib_logg.obj &\r
-       $(OBJS)\monolib_markuptext.obj &
-       $(OBJS)\monolib_msgdlgg.obj &
-       $(OBJS)\monolib_numdlgg.obj &
-       $(OBJS)\monolib_panelg.obj &
-       $(OBJS)\monolib_progdlgg.obj &
-       $(OBJS)\monolib_printps.obj &
-       $(OBJS)\monolib_renderg.obj &
+       $(OBJS)\monolib_markuptext.obj &\r
+       $(OBJS)\monolib_msgdlgg.obj &\r
+       $(OBJS)\monolib_numdlgg.obj &\r
+       $(OBJS)\monolib_panelg.obj &\r
+       $(OBJS)\monolib_progdlgg.obj &\r
+       $(OBJS)\monolib_printps.obj &\r
+       $(OBJS)\monolib_renderg.obj &\r
        $(OBJS)\monolib_richmsgdlgg.obj &\r
        $(OBJS)\monolib_scrlwing.obj &\r
        $(OBJS)\monolib_selstore.obj &\r
@@ -1564,6 +1580,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_hyperlnkcmn.obj &\r
        $(OBJS)\monolib_odcombocmn.obj &\r
        $(OBJS)\monolib_aboutdlgg.obj &\r
+       $(OBJS)\monolib_bannerwindow.obj &\r
        $(OBJS)\monolib_bmpcboxg.obj &\r
        $(OBJS)\monolib_calctrlg.obj &\r
        $(OBJS)\monolib_commandlinkbuttong.obj &\r
@@ -1583,10 +1600,10 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_sashwin.obj &\r
        $(OBJS)\monolib_splash.obj &\r
        $(OBJS)\monolib_tipdlg.obj &\r
+       $(OBJS)\monolib_treelist.obj &\r
        $(OBJS)\monolib_wizard.obj &\r
        $(OBJS)\monolib_taskbarcmn.obj &\r
        $(OBJS)\monolib_aboutdlg.obj &\r
-       $(OBJS)\monolib_hyperlink.obj &\r
        $(OBJS)\monolib_notifmsg.obj &\r
        $(OBJS)\monolib_sound.obj &\r
        $(OBJS)\monolib_taskbar.obj &\r
@@ -1596,7 +1613,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_calctrl.obj &\r
        $(OBJS)\monolib_commandlinkbutton.obj &\r
        $(OBJS)\monolib_datecontrols.obj &\r
-       $(OBJS)\monolib_datectrl.obj\r
+       $(OBJS)\monolib_datectrl.obj &\r
+       $(OBJS)\monolib_datetimectrl.obj &
+       $(OBJS)\monolib_hyperlink.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &\r
@@ -1608,6 +1627,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_hyperlnkcmn.obj &\r
        $(OBJS)\monolib_odcombocmn.obj &\r
        $(OBJS)\monolib_aboutdlgg.obj &\r
+       $(OBJS)\monolib_bannerwindow.obj &\r
        $(OBJS)\monolib_bmpcboxg.obj &\r
        $(OBJS)\monolib_calctrlg.obj &\r
        $(OBJS)\monolib_commandlinkbuttong.obj &\r
@@ -1627,10 +1647,10 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_sashwin.obj &\r
        $(OBJS)\monolib_splash.obj &\r
        $(OBJS)\monolib_tipdlg.obj &\r
+       $(OBJS)\monolib_treelist.obj &\r
        $(OBJS)\monolib_wizard.obj &\r
        $(OBJS)\monolib_taskbarcmn.obj &\r
        $(OBJS)\monolib_aboutdlg.obj &\r
-       $(OBJS)\monolib_hyperlink.obj &\r
        $(OBJS)\monolib_notifmsg.obj &\r
        $(OBJS)\monolib_sound.obj &\r
        $(OBJS)\monolib_taskbar.obj &\r
@@ -1727,7 +1747,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_droptgt.obj &\r
        $(OBJS)\coredll_oleutils.obj &\r
        $(OBJS)\coredll_palette.obj &\r
-       $(OBJS)\coredll_panel.obj &
        $(OBJS)\coredll_pen.obj &\r
        $(OBJS)\coredll_popupwin.obj &\r
        $(OBJS)\coredll_printdlg.obj &\r
@@ -1737,7 +1756,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_settings.obj &\r
        $(OBJS)\coredll_tooltip.obj &\r
        $(OBJS)\coredll_toplevel.obj &\r
-       $(OBJS)\coredll_uiaction.obj &
+       $(OBJS)\coredll_uiaction.obj &\r
        $(OBJS)\coredll_utilsgui.obj &\r
        $(OBJS)\coredll_uxtheme.obj &\r
        $(OBJS)\coredll_window.obj &\r
@@ -1752,6 +1771,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_generic_statusbr.obj &\r
        $(OBJS)\coredll_prntdlgg.obj &\r
        $(OBJS)\coredll_msw_accel.obj &\r
+       $(OBJS)\coredll_anybutton.obj &\r
        $(OBJS)\coredll_artmsw.obj &\r
        $(OBJS)\coredll_msw_bmpbuttn.obj &\r
        $(OBJS)\coredll_msw_button.obj &\r
@@ -1781,6 +1801,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_msw_notebook.obj &\r
        $(OBJS)\coredll_access.obj &\r
        $(OBJS)\coredll_ownerdrw.obj &\r
+       $(OBJS)\coredll_panel.obj &\r
        $(OBJS)\coredll_progdlg.obj &\r
        $(OBJS)\coredll_msw_radiobox.obj &\r
        $(OBJS)\coredll_msw_radiobut.obj &\r
@@ -1805,6 +1826,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_accelcmn.obj &\r
        $(OBJS)\coredll_accesscmn.obj &\r
        $(OBJS)\coredll_anidecod.obj &\r
+       $(OBJS)\coredll_affinematrix2d.obj &\r
        $(OBJS)\coredll_appcmn.obj &\r
        $(OBJS)\coredll_artprov.obj &\r
        $(OBJS)\coredll_artstd.obj &\r
@@ -1880,7 +1902,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_layout.obj &\r
        $(OBJS)\coredll_lboxcmn.obj &\r
        $(OBJS)\coredll_listctrlcmn.obj &\r
-       $(OBJS)\coredll_markupparser.obj &
+       $(OBJS)\coredll_markupparser.obj &\r
        $(OBJS)\coredll_matrix.obj &\r
        $(OBJS)\coredll_menucmn.obj &\r
        $(OBJS)\coredll_mousemanager.obj &\r
@@ -1939,13 +1961,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_infobar.obj &\r
        $(OBJS)\coredll_listbkg.obj &\r
        $(OBJS)\coredll_logg.obj &\r
-       $(OBJS)\coredll_markuptext.obj &
-       $(OBJS)\coredll_msgdlgg.obj &
-       $(OBJS)\coredll_numdlgg.obj &
-       $(OBJS)\coredll_panelg.obj &
-       $(OBJS)\coredll_progdlgg.obj &
-       $(OBJS)\coredll_printps.obj &
-       $(OBJS)\coredll_renderg.obj &
+       $(OBJS)\coredll_markuptext.obj &\r
+       $(OBJS)\coredll_msgdlgg.obj &\r
+       $(OBJS)\coredll_numdlgg.obj &\r
+       $(OBJS)\coredll_panelg.obj &\r
+       $(OBJS)\coredll_progdlgg.obj &\r
+       $(OBJS)\coredll_printps.obj &\r
+       $(OBJS)\coredll_renderg.obj &\r
        $(OBJS)\coredll_richmsgdlgg.obj &\r
        $(OBJS)\coredll_scrlwing.obj &\r
        $(OBJS)\coredll_selstore.obj &\r
@@ -1999,7 +2021,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_droptgt.obj &\r
        $(OBJS)\coredll_oleutils.obj &\r
        $(OBJS)\coredll_palette.obj &\r
-       $(OBJS)\coredll_panel.obj &
        $(OBJS)\coredll_pen.obj &\r
        $(OBJS)\coredll_popupwin.obj &\r
        $(OBJS)\coredll_printdlg.obj &\r
@@ -2009,7 +2030,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_settings.obj &\r
        $(OBJS)\coredll_tooltip.obj &\r
        $(OBJS)\coredll_toplevel.obj &\r
-       $(OBJS)\coredll_uiaction.obj &
+       $(OBJS)\coredll_uiaction.obj &\r
        $(OBJS)\coredll_utilsgui.obj &\r
        $(OBJS)\coredll_uxtheme.obj &\r
        $(OBJS)\coredll_window.obj &\r
@@ -2073,6 +2094,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_accelcmn.obj &\r
        $(OBJS)\coredll_accesscmn.obj &\r
        $(OBJS)\coredll_anidecod.obj &\r
+       $(OBJS)\coredll_affinematrix2d.obj &\r
        $(OBJS)\coredll_appcmn.obj &\r
        $(OBJS)\coredll_artprov.obj &\r
        $(OBJS)\coredll_artstd.obj &\r
@@ -2148,7 +2170,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_layout.obj &\r
        $(OBJS)\coredll_lboxcmn.obj &\r
        $(OBJS)\coredll_listctrlcmn.obj &\r
-       $(OBJS)\coredll_markupparser.obj &
+       $(OBJS)\coredll_markupparser.obj &\r
        $(OBJS)\coredll_matrix.obj &\r
        $(OBJS)\coredll_menucmn.obj &\r
        $(OBJS)\coredll_mousemanager.obj &\r
@@ -2207,13 +2229,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_infobar.obj &\r
        $(OBJS)\coredll_listbkg.obj &\r
        $(OBJS)\coredll_logg.obj &\r
-       $(OBJS)\coredll_markuptext.obj &
-       $(OBJS)\coredll_msgdlgg.obj &
-       $(OBJS)\coredll_numdlgg.obj &
-       $(OBJS)\coredll_panelg.obj &
-       $(OBJS)\coredll_progdlgg.obj &
-       $(OBJS)\coredll_printps.obj &
-       $(OBJS)\coredll_renderg.obj &
+       $(OBJS)\coredll_markuptext.obj &\r
+       $(OBJS)\coredll_msgdlgg.obj &\r
+       $(OBJS)\coredll_numdlgg.obj &\r
+       $(OBJS)\coredll_panelg.obj &\r
+       $(OBJS)\coredll_progdlgg.obj &\r
+       $(OBJS)\coredll_printps.obj &\r
+       $(OBJS)\coredll_renderg.obj &\r
        $(OBJS)\coredll_richmsgdlgg.obj &\r
        $(OBJS)\coredll_scrlwing.obj &\r
        $(OBJS)\coredll_selstore.obj &\r
@@ -2277,7 +2299,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_droptgt.obj &\r
        $(OBJS)\corelib_oleutils.obj &\r
        $(OBJS)\corelib_palette.obj &\r
-       $(OBJS)\corelib_panel.obj &
        $(OBJS)\corelib_pen.obj &\r
        $(OBJS)\corelib_popupwin.obj &\r
        $(OBJS)\corelib_printdlg.obj &\r
@@ -2287,7 +2308,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_settings.obj &\r
        $(OBJS)\corelib_tooltip.obj &\r
        $(OBJS)\corelib_toplevel.obj &\r
-       $(OBJS)\corelib_uiaction.obj &
+       $(OBJS)\corelib_uiaction.obj &\r
        $(OBJS)\corelib_utilsgui.obj &\r
        $(OBJS)\corelib_uxtheme.obj &\r
        $(OBJS)\corelib_window.obj &\r
@@ -2302,6 +2323,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_generic_statusbr.obj &\r
        $(OBJS)\corelib_prntdlgg.obj &\r
        $(OBJS)\corelib_msw_accel.obj &\r
+       $(OBJS)\corelib_anybutton.obj &\r
        $(OBJS)\corelib_artmsw.obj &\r
        $(OBJS)\corelib_msw_bmpbuttn.obj &\r
        $(OBJS)\corelib_msw_button.obj &\r
@@ -2331,6 +2353,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_msw_notebook.obj &\r
        $(OBJS)\corelib_access.obj &\r
        $(OBJS)\corelib_ownerdrw.obj &\r
+       $(OBJS)\corelib_panel.obj &\r
        $(OBJS)\corelib_progdlg.obj &\r
        $(OBJS)\corelib_msw_radiobox.obj &\r
        $(OBJS)\corelib_msw_radiobut.obj &\r
@@ -2355,6 +2378,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_accelcmn.obj &\r
        $(OBJS)\corelib_accesscmn.obj &\r
        $(OBJS)\corelib_anidecod.obj &\r
+       $(OBJS)\corelib_affinematrix2d.obj &\r
        $(OBJS)\corelib_appcmn.obj &\r
        $(OBJS)\corelib_artprov.obj &\r
        $(OBJS)\corelib_artstd.obj &\r
@@ -2430,7 +2454,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_layout.obj &\r
        $(OBJS)\corelib_lboxcmn.obj &\r
        $(OBJS)\corelib_listctrlcmn.obj &\r
-       $(OBJS)\corelib_markupparser.obj &
+       $(OBJS)\corelib_markupparser.obj &\r
        $(OBJS)\corelib_matrix.obj &\r
        $(OBJS)\corelib_menucmn.obj &\r
        $(OBJS)\corelib_mousemanager.obj &\r
@@ -2489,13 +2513,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_infobar.obj &\r
        $(OBJS)\corelib_listbkg.obj &\r
        $(OBJS)\corelib_logg.obj &\r
-       $(OBJS)\corelib_markuptext.obj &
-       $(OBJS)\corelib_msgdlgg.obj &
-       $(OBJS)\corelib_numdlgg.obj &
-       $(OBJS)\corelib_panelg.obj &
-       $(OBJS)\corelib_progdlgg.obj &
-       $(OBJS)\corelib_printps.obj &
-       $(OBJS)\corelib_renderg.obj &
+       $(OBJS)\corelib_markuptext.obj &\r
+       $(OBJS)\corelib_msgdlgg.obj &\r
+       $(OBJS)\corelib_numdlgg.obj &\r
+       $(OBJS)\corelib_panelg.obj &\r
+       $(OBJS)\corelib_progdlgg.obj &\r
+       $(OBJS)\corelib_printps.obj &\r
+       $(OBJS)\corelib_renderg.obj &\r
        $(OBJS)\corelib_richmsgdlgg.obj &\r
        $(OBJS)\corelib_scrlwing.obj &\r
        $(OBJS)\corelib_selstore.obj &\r
@@ -2549,7 +2573,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_droptgt.obj &\r
        $(OBJS)\corelib_oleutils.obj &\r
        $(OBJS)\corelib_palette.obj &\r
-       $(OBJS)\corelib_panel.obj &
        $(OBJS)\corelib_pen.obj &\r
        $(OBJS)\corelib_popupwin.obj &\r
        $(OBJS)\corelib_printdlg.obj &\r
@@ -2559,7 +2582,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_settings.obj &\r
        $(OBJS)\corelib_tooltip.obj &\r
        $(OBJS)\corelib_toplevel.obj &\r
-       $(OBJS)\corelib_uiaction.obj &
+       $(OBJS)\corelib_uiaction.obj &\r
        $(OBJS)\corelib_utilsgui.obj &\r
        $(OBJS)\corelib_uxtheme.obj &\r
        $(OBJS)\corelib_window.obj &\r
@@ -2623,6 +2646,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_accelcmn.obj &\r
        $(OBJS)\corelib_accesscmn.obj &\r
        $(OBJS)\corelib_anidecod.obj &\r
+       $(OBJS)\corelib_affinematrix2d.obj &\r
        $(OBJS)\corelib_appcmn.obj &\r
        $(OBJS)\corelib_artprov.obj &\r
        $(OBJS)\corelib_artstd.obj &\r
@@ -2698,7 +2722,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_layout.obj &\r
        $(OBJS)\corelib_lboxcmn.obj &\r
        $(OBJS)\corelib_listctrlcmn.obj &\r
-       $(OBJS)\corelib_markupparser.obj &
+       $(OBJS)\corelib_markupparser.obj &\r
        $(OBJS)\corelib_matrix.obj &\r
        $(OBJS)\corelib_menucmn.obj &\r
        $(OBJS)\corelib_mousemanager.obj &\r
@@ -2757,13 +2781,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_infobar.obj &\r
        $(OBJS)\corelib_listbkg.obj &\r
        $(OBJS)\corelib_logg.obj &\r
-       $(OBJS)\corelib_markuptext.obj &
-       $(OBJS)\corelib_msgdlgg.obj &
-       $(OBJS)\corelib_numdlgg.obj &
-       $(OBJS)\corelib_panelg.obj &
-       $(OBJS)\corelib_progdlgg.obj &
-       $(OBJS)\corelib_printps.obj &
-       $(OBJS)\corelib_renderg.obj &
+       $(OBJS)\corelib_markuptext.obj &\r
+       $(OBJS)\corelib_msgdlgg.obj &\r
+       $(OBJS)\corelib_numdlgg.obj &\r
+       $(OBJS)\corelib_panelg.obj &\r
+       $(OBJS)\corelib_progdlgg.obj &\r
+       $(OBJS)\corelib_printps.obj &\r
+       $(OBJS)\corelib_renderg.obj &\r
        $(OBJS)\corelib_richmsgdlgg.obj &\r
        $(OBJS)\corelib_scrlwing.obj &\r
        $(OBJS)\corelib_selstore.obj &\r
@@ -2809,6 +2833,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_hyperlnkcmn.obj &\r
        $(OBJS)\advdll_odcombocmn.obj &\r
        $(OBJS)\advdll_aboutdlgg.obj &\r
+       $(OBJS)\advdll_bannerwindow.obj &\r
        $(OBJS)\advdll_bmpcboxg.obj &\r
        $(OBJS)\advdll_calctrlg.obj &\r
        $(OBJS)\advdll_commandlinkbuttong.obj &\r
@@ -2828,10 +2853,10 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_sashwin.obj &\r
        $(OBJS)\advdll_splash.obj &\r
        $(OBJS)\advdll_tipdlg.obj &\r
+       $(OBJS)\advdll_treelist.obj &\r
        $(OBJS)\advdll_wizard.obj &\r
        $(OBJS)\advdll_taskbarcmn.obj &\r
        $(OBJS)\advdll_aboutdlg.obj &\r
-       $(OBJS)\advdll_hyperlink.obj &\r
        $(OBJS)\advdll_notifmsg.obj &\r
        $(OBJS)\advdll_sound.obj &\r
        $(OBJS)\advdll_taskbar.obj &\r
@@ -2841,7 +2866,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_calctrl.obj &\r
        $(OBJS)\advdll_commandlinkbutton.obj &\r
        $(OBJS)\advdll_datecontrols.obj &\r
-       $(OBJS)\advdll_datectrl.obj\r
+       $(OBJS)\advdll_datectrl.obj &\r
+       $(OBJS)\advdll_datetimectrl.obj &
+       $(OBJS)\advdll_hyperlink.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &\r
@@ -2853,6 +2880,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_hyperlnkcmn.obj &\r
        $(OBJS)\advdll_odcombocmn.obj &\r
        $(OBJS)\advdll_aboutdlgg.obj &\r
+       $(OBJS)\advdll_bannerwindow.obj &\r
        $(OBJS)\advdll_bmpcboxg.obj &\r
        $(OBJS)\advdll_calctrlg.obj &\r
        $(OBJS)\advdll_commandlinkbuttong.obj &\r
@@ -2872,10 +2900,10 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_sashwin.obj &\r
        $(OBJS)\advdll_splash.obj &\r
        $(OBJS)\advdll_tipdlg.obj &\r
+       $(OBJS)\advdll_treelist.obj &\r
        $(OBJS)\advdll_wizard.obj &\r
        $(OBJS)\advdll_taskbarcmn.obj &\r
        $(OBJS)\advdll_aboutdlg.obj &\r
-       $(OBJS)\advdll_hyperlink.obj &\r
        $(OBJS)\advdll_notifmsg.obj &\r
        $(OBJS)\advdll_sound.obj &\r
        $(OBJS)\advdll_taskbar.obj &\r
@@ -2902,6 +2930,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_hyperlnkcmn.obj &\r
        $(OBJS)\advlib_odcombocmn.obj &\r
        $(OBJS)\advlib_aboutdlgg.obj &\r
+       $(OBJS)\advlib_bannerwindow.obj &\r
        $(OBJS)\advlib_bmpcboxg.obj &\r
        $(OBJS)\advlib_calctrlg.obj &\r
        $(OBJS)\advlib_commandlinkbuttong.obj &\r
@@ -2921,10 +2950,10 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_sashwin.obj &\r
        $(OBJS)\advlib_splash.obj &\r
        $(OBJS)\advlib_tipdlg.obj &\r
+       $(OBJS)\advlib_treelist.obj &\r
        $(OBJS)\advlib_wizard.obj &\r
        $(OBJS)\advlib_taskbarcmn.obj &\r
        $(OBJS)\advlib_aboutdlg.obj &\r
-       $(OBJS)\advlib_hyperlink.obj &\r
        $(OBJS)\advlib_notifmsg.obj &\r
        $(OBJS)\advlib_sound.obj &\r
        $(OBJS)\advlib_taskbar.obj &\r
@@ -2934,7 +2963,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_calctrl.obj &\r
        $(OBJS)\advlib_commandlinkbutton.obj &\r
        $(OBJS)\advlib_datecontrols.obj &\r
-       $(OBJS)\advlib_datectrl.obj\r
+       $(OBJS)\advlib_datectrl.obj &\r
+       $(OBJS)\advlib_datetimectrl.obj &
+       $(OBJS)\advlib_hyperlink.obj\r
 !endif\r
 !ifeq WXUNIV 1\r
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &\r
@@ -2946,6 +2977,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_hyperlnkcmn.obj &\r
        $(OBJS)\advlib_odcombocmn.obj &\r
        $(OBJS)\advlib_aboutdlgg.obj &\r
+       $(OBJS)\advlib_bannerwindow.obj &\r
        $(OBJS)\advlib_bmpcboxg.obj &\r
        $(OBJS)\advlib_calctrlg.obj &\r
        $(OBJS)\advlib_commandlinkbuttong.obj &\r
@@ -2965,10 +2997,10 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_sashwin.obj &\r
        $(OBJS)\advlib_splash.obj &\r
        $(OBJS)\advlib_tipdlg.obj &\r
+       $(OBJS)\advlib_treelist.obj &\r
        $(OBJS)\advlib_wizard.obj &\r
        $(OBJS)\advlib_taskbarcmn.obj &\r
        $(OBJS)\advlib_aboutdlg.obj &\r
-       $(OBJS)\advlib_hyperlink.obj &\r
        $(OBJS)\advlib_notifmsg.obj &\r
        $(OBJS)\advlib_sound.obj &\r
        $(OBJS)\advlib_taskbar.obj &\r
@@ -3043,6 +3075,36 @@ ____wxhtml_namelib_DEP =
 !ifeq SHARED 0\r
 ____wxhtml_namelib_DEP = $(__htmllib___depname)\r
 !endif\r
+__webviewdll___depname =\r
+!ifeq MONOLITHIC 0\r
+!ifeq SHARED 1\r
+!ifeq USE_GUI 1\r
+!ifeq USE_WEBVIEW 1\r
+__webviewdll___depname = &\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_wat$(VENDORTAG).dll\r
+!endif\r
+!endif\r
+!endif\r
+!endif\r
+__webviewlib___depname =\r
+!ifeq MONOLITHIC 0\r
+!ifeq SHARED 0\r
+!ifeq USE_GUI 1\r
+!ifeq USE_WEBVIEW 1\r
+__webviewlib___depname = &\r
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+!endif\r
+!endif\r
+!endif\r
+!endif\r
+____wxwebview_namedll_DEP =\r
+!ifeq SHARED 1\r
+____wxwebview_namedll_DEP = $(__webviewdll___depname)\r
+!endif\r
+____wxwebview_namelib_DEP =\r
+!ifeq SHARED 0\r
+____wxwebview_namelib_DEP = $(__webviewlib___depname)\r
+!endif\r
 __qadll___depname =\r
 !ifeq MONOLITHIC 0\r
 !ifeq SHARED 1\r
@@ -3317,22 +3379,22 @@ __htmldll_library_link_LIBR = &
 !endif\r
 !endif\r
 !endif\r
-__DEBUGINFO_3 =\r
+__DEBUGINFO_4 =\r
 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r
-__DEBUGINFO_3 = debug all\r
+__DEBUGINFO_4 = debug all\r
 !endif\r
 !endif\r
 !ifeq BUILD release\r
 !ifeq DEBUG_INFO default\r
-__DEBUGINFO_3 = \r
+__DEBUGINFO_4 = \r
 !endif\r
 !endif\r
 !ifeq DEBUG_INFO 0\r
-__DEBUGINFO_3 = \r
+__DEBUGINFO_4 = \r
 !endif\r
 !ifeq DEBUG_INFO 1\r
-__DEBUGINFO_3 = debug all\r
+__DEBUGINFO_4 = debug all\r
 !endif\r
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
@@ -3456,10 +3518,10 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
+       USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" &\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" &\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" &\r
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
        USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" &\r
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &\r
@@ -3467,7 +3529,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
@@ -4492,6 +4554,34 @@ HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_styleparams.obj &\r
        $(OBJS)\htmllib_winpars.obj &\r
        $(OBJS)\htmllib_htmllbox.obj\r
+WEBVIEWDLL_CXXFLAGS = -bd $(__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 &\r
+       -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png &\r
+       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &\r
+       -dWXMAKINGDLL_WEBVIEW /fh=$(OBJS)\wxprec_webviewdll.pch $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+WEBVIEWDLL_OBJECTS =  &\r
+       $(OBJS)\webviewdll_dummy.obj &\r
+       $(OBJS)\webviewdll_webview_ie.obj &\r
+       $(OBJS)\webviewdll_webview.obj &\r
+       $(OBJS)\webviewdll_webviewarchivehandler.obj\r
+WEBVIEWLIB_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 &\r
+       -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png &\r
+       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &\r
+       /fh=$(OBJS)\wxprec_webviewlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &\r
+       $(CPPFLAGS) $(CXXFLAGS)\r
+WEBVIEWLIB_OBJECTS =  &\r
+       $(OBJS)\webviewlib_dummy.obj &\r
+       $(OBJS)\webviewlib_webview_ie.obj &\r
+       $(OBJS)\webviewlib_webview.obj &\r
+       $(OBJS)\webviewlib_webviewarchivehandler.obj\r
 QADLL_CXXFLAGS = -bd $(__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
@@ -4556,6 +4646,7 @@ XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 XRCDLL_OBJECTS =  &\r
        $(OBJS)\xrcdll_dummy.obj &\r
        $(OBJS)\xrcdll_xh_animatctrl.obj &\r
+       $(OBJS)\xrcdll_xh_bannerwindow.obj &\r
        $(OBJS)\xrcdll_xh_bmp.obj &\r
        $(OBJS)\xrcdll_xh_bmpcbox.obj &\r
        $(OBJS)\xrcdll_xh_bmpbt.obj &\r
@@ -4630,6 +4721,7 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 XRCLIB_OBJECTS =  &\r
        $(OBJS)\xrclib_dummy.obj &\r
        $(OBJS)\xrclib_xh_animatctrl.obj &\r
+       $(OBJS)\xrclib_xh_bannerwindow.obj &\r
        $(OBJS)\xrclib_xh_bmp.obj &\r
        $(OBJS)\xrclib_xh_bmpcbox.obj &\r
        $(OBJS)\xrclib_xh_bmpbt.obj &\r
@@ -4817,16 +4909,16 @@ RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
 RICHTEXTDLL_OBJECTS =  &\r
        $(OBJS)\richtextdll_dummy.obj &\r
-       $(OBJS)\richtextdll_richtextctrl.obj &\r
        $(OBJS)\richtextdll_richtextbuffer.obj &\r
-       $(OBJS)\richtextdll_richtextstyles.obj &\r
-       $(OBJS)\richtextdll_richtextxml.obj &\r
-       $(OBJS)\richtextdll_richtexthtml.obj &\r
+       $(OBJS)\richtextdll_richtextctrl.obj &\r
        $(OBJS)\richtextdll_richtextformatdlg.obj &\r
-       $(OBJS)\richtextdll_richtextsymboldlg.obj &\r
-       $(OBJS)\richtextdll_richtextstyledlg.obj &\r
+       $(OBJS)\richtextdll_richtexthtml.obj &\r
+       $(OBJS)\richtextdll_richtextimagedlg.obj &\r
        $(OBJS)\richtextdll_richtextprint.obj &\r
-       $(OBJS)\richtextdll_richtextimagedlg.obj\r
+       $(OBJS)\richtextdll_richtextstyledlg.obj &\r
+       $(OBJS)\richtextdll_richtextstyles.obj &\r
+       $(OBJS)\richtextdll_richtextsymboldlg.obj &\r
+       $(OBJS)\richtextdll_richtextxml.obj\r
 RICHTEXTLIB_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
@@ -4838,16 +4930,16 @@ RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(CPPFLAGS) $(CXXFLAGS)\r
 RICHTEXTLIB_OBJECTS =  &\r
        $(OBJS)\richtextlib_dummy.obj &\r
-       $(OBJS)\richtextlib_richtextctrl.obj &\r
        $(OBJS)\richtextlib_richtextbuffer.obj &\r
-       $(OBJS)\richtextlib_richtextstyles.obj &\r
-       $(OBJS)\richtextlib_richtextxml.obj &\r
-       $(OBJS)\richtextlib_richtexthtml.obj &\r
+       $(OBJS)\richtextlib_richtextctrl.obj &\r
        $(OBJS)\richtextlib_richtextformatdlg.obj &\r
-       $(OBJS)\richtextlib_richtextsymboldlg.obj &\r
-       $(OBJS)\richtextlib_richtextstyledlg.obj &\r
+       $(OBJS)\richtextlib_richtexthtml.obj &\r
+       $(OBJS)\richtextlib_richtextimagedlg.obj &\r
        $(OBJS)\richtextlib_richtextprint.obj &\r
-       $(OBJS)\richtextlib_richtextimagedlg.obj\r
+       $(OBJS)\richtextlib_richtextstyledlg.obj &\r
+       $(OBJS)\richtextlib_richtextstyles.obj &\r
+       $(OBJS)\richtextlib_richtextsymboldlg.obj &\r
+       $(OBJS)\richtextlib_richtextxml.obj\r
 STCDLL_CXXFLAGS = -bd $(__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
@@ -4914,7 +5006,7 @@ $(OBJS) :
 \r
 ### Targets: ###\r
 \r
-all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file\r
+all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file\r
 \r
 clean : .SYMBOLIC \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
@@ -4950,6 +5042,9 @@ clean : .SYMBOLIC
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_wat$(VENDORTAG).dll\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
@@ -5033,7 +5128,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\monodll.lbc option quiet\r
        @%append $(OBJS)\monodll.lbc name $^@\r
        @%append $(OBJS)\monodll.lbc option caseexact\r
-       @%append $(OBJS)\monodll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\monodll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i\r
        @for %i in ( $(__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     $(__wxscintilla)) do @%append $(OBJS)\monodll.lbc library %i\r
        @%append $(OBJS)\monodll.lbc option resource=$(OBJS)\monodll_version.res\r
@@ -5059,7 +5154,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
        @%append $(OBJS)\basedll.lbc option quiet\r
        @%append $(OBJS)\basedll.lbc name $^@\r
        @%append $(OBJS)\basedll.lbc option caseexact\r
-       @%append $(OBJS)\basedll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\basedll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i\r
        @for %i in ( 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)\basedll.lbc library %i\r
        @%append $(OBJS)\basedll.lbc option resource=$(OBJS)\basedll_version.res\r
@@ -5089,7 +5184,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
        @%append $(OBJS)\netdll.lbc option quiet\r
        @%append $(OBJS)\netdll.lbc name $^@\r
        @%append $(OBJS)\netdll.lbc option caseexact\r
-       @%append $(OBJS)\netdll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\netdll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i\r
        @for %i in ( 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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i\r
        @%append $(OBJS)\netdll.lbc option resource=$(OBJS)\netdll_version.res\r
@@ -5120,7 +5215,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\coredll.lbc option quiet\r
        @%append $(OBJS)\coredll.lbc name $^@\r
        @%append $(OBJS)\coredll.lbc option caseexact\r
-       @%append $(OBJS)\coredll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\coredll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i\r
        @%append $(OBJS)\coredll.lbc option resource=$(OBJS)\coredll_version.res\r
@@ -5156,7 +5251,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\advdll.lbc option quiet\r
        @%append $(OBJS)\advdll.lbc name $^@\r
        @%append $(OBJS)\advdll.lbc option caseexact\r
-       @%append $(OBJS)\advdll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\advdll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i\r
        @%append $(OBJS)\advdll.lbc option resource=$(OBJS)\advdll_version.res\r
@@ -5193,7 +5288,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\mediadll.lbc option quiet\r
        @%append $(OBJS)\mediadll.lbc name $^@\r
        @%append $(OBJS)\mediadll.lbc option caseexact\r
-       @%append $(OBJS)\mediadll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\mediadll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\mediadll.lbc library %i\r
        @%append $(OBJS)\mediadll.lbc option resource=$(OBJS)\mediadll_version.res\r
@@ -5235,7 +5330,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\htmldll.lbc option quiet\r
        @%append $(OBJS)\htmldll.lbc name $^@\r
        @%append $(OBJS)\htmldll.lbc option caseexact\r
-       @%append $(OBJS)\htmldll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\htmldll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i\r
        @%append $(OBJS)\htmldll.lbc option resource=$(OBJS)\htmldll_version.res\r
@@ -5266,6 +5361,46 @@ wxhtml : .SYMBOLIC $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 !endif\r
 !endif\r
 \r
+!ifeq MONOLITHIC 0\r
+!ifeq SHARED 1\r
+!ifeq USE_GUI 1\r
+!ifeq USE_WEBVIEW 1\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_wat$(VENDORTAG).dll :  $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname)\r
+       @%create $(OBJS)\webviewdll.lbc\r
+       @%append $(OBJS)\webviewdll.lbc option quiet\r
+       @%append $(OBJS)\webviewdll.lbc name $^@\r
+       @%append $(OBJS)\webviewdll.lbc option caseexact\r
+       @%append $(OBJS)\webviewdll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @for %i in ($(WEBVIEWDLL_OBJECTS)) do @%append $(OBJS)\webviewdll.lbc file %i\r
+       @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\webviewdll.lbc library %i\r
+       @%append $(OBJS)\webviewdll.lbc option resource=$(OBJS)\webviewdll_version.res\r
+       @%append $(OBJS)\webviewdll.lbc system nt_dll\r
+       wlink @$(OBJS)\webviewdll.lbc\r
+       wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib +$^@\r
+!endif\r
+!endif\r
+!endif\r
+!endif\r
+\r
+!ifeq MONOLITHIC 0\r
+!ifeq SHARED 0\r
+!ifeq USE_GUI 1\r
+!ifeq USE_WEBVIEW 1\r
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib :  $(WEBVIEWLIB_OBJECTS)\r
+       @%create $(OBJS)\webviewlib.lbc\r
+       @for %i in ($(WEBVIEWLIB_OBJECTS)) do @%append $(OBJS)\webviewlib.lbc +%i\r
+       wlib -q -p4096 -n -b $^@ @$(OBJS)\webviewlib.lbc\r
+!endif\r
+!endif\r
+!endif\r
+!endif\r
+\r
+!ifeq MONOLITHIC 0\r
+!ifeq USE_WEBVIEW 1\r
+wxwebview : .SYMBOLIC $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP)\r
+!endif\r
+!endif\r
+\r
 !ifeq MONOLITHIC 0\r
 !ifeq SHARED 1\r
 !ifeq USE_GUI 1\r
@@ -5275,7 +5410,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\qadll.lbc option quiet\r
        @%append $(OBJS)\qadll.lbc name $^@\r
        @%append $(OBJS)\qadll.lbc option caseexact\r
-       @%append $(OBJS)\qadll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\qadll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i\r
        @%append $(OBJS)\qadll.lbc option resource=$(OBJS)\qadll_version.res\r
@@ -5313,7 +5448,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
        @%append $(OBJS)\xmldll.lbc option quiet\r
        @%append $(OBJS)\xmldll.lbc name $^@\r
        @%append $(OBJS)\xmldll.lbc option caseexact\r
-       @%append $(OBJS)\xmldll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\xmldll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i\r
        @for %i in ( 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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i\r
        @%append $(OBJS)\xmldll.lbc option resource=$(OBJS)\xmldll_version.res\r
@@ -5344,7 +5479,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\xrcdll.lbc option quiet\r
        @%append $(OBJS)\xrcdll.lbc name $^@\r
        @%append $(OBJS)\xrcdll.lbc option caseexact\r
-       @%append $(OBJS)\xrcdll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\xrcdll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i\r
        @for %i in ( $(__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 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i\r
        @%append $(OBJS)\xrcdll.lbc option resource=$(OBJS)\xrcdll_version.res\r
@@ -5380,7 +5515,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\auidll.lbc option quiet\r
        @%append $(OBJS)\auidll.lbc name $^@\r
        @%append $(OBJS)\auidll.lbc option caseexact\r
-       @%append $(OBJS)\auidll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\auidll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i\r
        @%append $(OBJS)\auidll.lbc option resource=$(OBJS)\auidll_version.res\r
@@ -5416,7 +5551,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\ribbondll.lbc option quiet\r
        @%append $(OBJS)\ribbondll.lbc name $^@\r
        @%append $(OBJS)\ribbondll.lbc option caseexact\r
-       @%append $(OBJS)\ribbondll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\ribbondll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RIBBONDLL_OBJECTS)) do @%append $(OBJS)\ribbondll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\ribbondll.lbc library %i\r
        @%append $(OBJS)\ribbondll.lbc option resource=$(OBJS)\ribbondll_version.res\r
@@ -5452,7 +5587,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\propgriddll.lbc option quiet\r
        @%append $(OBJS)\propgriddll.lbc name $^@\r
        @%append $(OBJS)\propgriddll.lbc option caseexact\r
-       @%append $(OBJS)\propgriddll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\propgriddll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(PROPGRIDDLL_OBJECTS)) do @%append $(OBJS)\propgriddll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\propgriddll.lbc library %i\r
        @%append $(OBJS)\propgriddll.lbc option resource=$(OBJS)\propgriddll_version.res\r
@@ -5488,7 +5623,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\richtextdll.lbc option quiet\r
        @%append $(OBJS)\richtextdll.lbc name $^@\r
        @%append $(OBJS)\richtextdll.lbc option caseexact\r
-       @%append $(OBJS)\richtextdll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\richtextdll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i\r
        @%append $(OBJS)\richtextdll.lbc option resource=$(OBJS)\richtextdll_version.res\r
@@ -5524,7 +5659,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\stcdll.lbc option quiet\r
        @%append $(OBJS)\stcdll.lbc name $^@\r
        @%append $(OBJS)\stcdll.lbc option caseexact\r
-       @%append $(OBJS)\stcdll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\stcdll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i\r
        @for %i in ( $(__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 $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\stcdll.lbc library %i\r
        @%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res\r
@@ -5560,7 +5695,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\gldll.lbc option quiet\r
        @%append $(OBJS)\gldll.lbc name $^@\r
        @%append $(OBJS)\gldll.lbc option caseexact\r
-       @%append $(OBJS)\gldll.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @%append $(OBJS)\gldll.lbc  $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i\r
        @for %i in ( $(__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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i\r
        @%append $(OBJS)\gldll.lbc option resource=$(OBJS)\gldll_version.res\r
@@ -5617,7 +5752,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r
-       @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)\r
+       @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)\r
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
@@ -5634,6 +5769,7 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
@@ -6686,6 +6822,9 @@ $(OBJS)\monodll_generic_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.c
 $(OBJS)\monodll_msw_accel.obj :  .AUTODEPEND ..\..\src\msw\accel.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\monodll_anybutton.obj :  .AUTODEPEND ..\..\src\msw\anybutton.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_artmsw.obj :  .AUTODEPEND ..\..\src\msw\artmsw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -6773,6 +6912,9 @@ $(OBJS)\monodll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 $(OBJS)\monodll_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\monodll_msw_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_progdlg.obj :  .AUTODEPEND ..\..\src\msw\progdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -6995,6 +7137,12 @@ $(OBJS)\monodll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
 $(OBJS)\monodll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -7085,6 +7233,15 @@ $(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monodll_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\monodll_webview_ie.obj :  .AUTODEPEND ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -7094,6 +7251,9 @@ $(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\monodll_xh_bannerwindow.obj :  .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -7346,40 +7506,40 @@ $(OBJS)\monodll_gallery.obj :  .AUTODEPEND ..\..\src\ribbon\gallery.cpp
 $(OBJS)\monodll_page.obj :  .AUTODEPEND ..\..\src\ribbon\page.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_ribbon_panel.obj :  .AUTODEPEND ..\..\src\ribbon\panel.cpp
+$(OBJS)\monodll_ribbon_panel.obj :  .AUTODEPEND ..\..\src\ribbon\panel.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\monodll_ribbon_toolbar.obj :  .AUTODEPEND ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
-\r
 $(OBJS)\monodll_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
+$(OBJS)\monodll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\monodll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\monodll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\monodll_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\monodll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\monodll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\monodll_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\monodll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\monodll_stc.obj :  .AUTODEPEND ..\..\src\stc\stc.cpp\r
@@ -7563,11 +7723,6 @@ $(OBJS)\monodll_palette.obj :  .AUTODEPEND ..\..\src\msw\palette.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_msw_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\monodll_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
@@ -7613,11 +7768,11 @@ $(OBJS)\monodll_toplevel.obj :  .AUTODEPEND ..\..\src\msw\toplevel.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monodll_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\monodll_utilsgui.obj :  .AUTODEPEND ..\..\src\msw\utilsgui.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
@@ -7692,6 +7847,11 @@ $(OBJS)\monodll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -8068,11 +8228,11 @@ $(OBJS)\monodll_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monodll_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\monodll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
@@ -8363,26 +8523,26 @@ $(OBJS)\monodll_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp
+$(OBJS)\monodll_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
+$(OBJS)\monodll_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
+$(OBJS)\monodll_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\monodll_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
@@ -8512,6 +8672,11 @@ $(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -8608,22 +8773,22 @@ $(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
+$(OBJS)\monodll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp\r
+$(OBJS)\monodll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
+$(OBJS)\monodll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+$(OBJS)\monodll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -9033,6 +9198,9 @@ $(OBJS)\monolib_generic_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.c
 $(OBJS)\monolib_msw_accel.obj :  .AUTODEPEND ..\..\src\msw\accel.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\monolib_anybutton.obj :  .AUTODEPEND ..\..\src\msw\anybutton.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_artmsw.obj :  .AUTODEPEND ..\..\src\msw\artmsw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -9120,6 +9288,9 @@ $(OBJS)\monolib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 $(OBJS)\monolib_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\monolib_msw_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_progdlg.obj :  .AUTODEPEND ..\..\src\msw\progdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -9342,6 +9513,12 @@ $(OBJS)\monolib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
 $(OBJS)\monolib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -9432,6 +9609,15 @@ $(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monolib_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\monolib_webview_ie.obj :  .AUTODEPEND ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -9441,6 +9627,9 @@ $(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\monolib_xh_bannerwindow.obj :  .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -9693,40 +9882,40 @@ $(OBJS)\monolib_gallery.obj :  .AUTODEPEND ..\..\src\ribbon\gallery.cpp
 $(OBJS)\monolib_page.obj :  .AUTODEPEND ..\..\src\ribbon\page.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_ribbon_panel.obj :  .AUTODEPEND ..\..\src\ribbon\panel.cpp
+$(OBJS)\monolib_ribbon_panel.obj :  .AUTODEPEND ..\..\src\ribbon\panel.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\monolib_ribbon_toolbar.obj :  .AUTODEPEND ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
-\r
 $(OBJS)\monolib_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
+$(OBJS)\monolib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\monolib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\monolib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\monolib_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\monolib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\monolib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\monolib_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\monolib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\monolib_stc.obj :  .AUTODEPEND ..\..\src\stc\stc.cpp\r
@@ -9910,11 +10099,6 @@ $(OBJS)\monolib_palette.obj :  .AUTODEPEND ..\..\src\msw\palette.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_msw_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\monolib_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
@@ -9960,11 +10144,11 @@ $(OBJS)\monolib_toplevel.obj :  .AUTODEPEND ..\..\src\msw\toplevel.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monolib_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\monolib_utilsgui.obj :  .AUTODEPEND ..\..\src\msw\utilsgui.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
@@ -10039,6 +10223,11 @@ $(OBJS)\monolib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10415,11 +10604,11 @@ $(OBJS)\monolib_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monolib_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\monolib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
@@ -10710,26 +10899,26 @@ $(OBJS)\monolib_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp
+$(OBJS)\monolib_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
+$(OBJS)\monolib_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
+$(OBJS)\monolib_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\monolib_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
@@ -10859,6 +11048,11 @@ $(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10955,22 +11149,22 @@ $(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
+$(OBJS)\monolib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp\r
+$(OBJS)\monolib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
+$(OBJS)\monolib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+$(OBJS)\monolib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -11791,6 +11985,9 @@ $(OBJS)\coredll_generic_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.c
 $(OBJS)\coredll_msw_accel.obj :  .AUTODEPEND ..\..\src\msw\accel.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\coredll_anybutton.obj :  .AUTODEPEND ..\..\src\msw\anybutton.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\coredll_artmsw.obj :  .AUTODEPEND ..\..\src\msw\artmsw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 \r
@@ -11878,6 +12075,9 @@ $(OBJS)\coredll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 $(OBJS)\coredll_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\coredll_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\coredll_progdlg.obj :  .AUTODEPEND ..\..\src\msw\progdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 \r
@@ -12251,11 +12451,6 @@ $(OBJS)\coredll_palette.obj :  .AUTODEPEND ..\..\src\msw\palette.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\coredll_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
@@ -12301,11 +12496,11 @@ $(OBJS)\coredll_toplevel.obj :  .AUTODEPEND ..\..\src\msw\toplevel.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\coredll_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\coredll_utilsgui.obj :  .AUTODEPEND ..\..\src\msw\utilsgui.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
@@ -12380,6 +12575,11 @@ $(OBJS)\coredll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12756,11 +12956,11 @@ $(OBJS)\coredll_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\coredll_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\coredll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
@@ -13051,26 +13251,26 @@ $(OBJS)\coredll_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp
+$(OBJS)\coredll_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
+$(OBJS)\coredll_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
+$(OBJS)\coredll_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\coredll_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
@@ -13193,6 +13393,9 @@ $(OBJS)\corelib_generic_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.c
 $(OBJS)\corelib_msw_accel.obj :  .AUTODEPEND ..\..\src\msw\accel.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\corelib_anybutton.obj :  .AUTODEPEND ..\..\src\msw\anybutton.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\corelib_artmsw.obj :  .AUTODEPEND ..\..\src\msw\artmsw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 \r
@@ -13280,6 +13483,9 @@ $(OBJS)\corelib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 $(OBJS)\corelib_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\corelib_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\corelib_progdlg.obj :  .AUTODEPEND ..\..\src\msw\progdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 \r
@@ -13653,11 +13859,6 @@ $(OBJS)\corelib_palette.obj :  .AUTODEPEND ..\..\src\msw\palette.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_panel.obj :  .AUTODEPEND ..\..\src\msw\panel.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\corelib_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
@@ -13703,11 +13904,11 @@ $(OBJS)\corelib_toplevel.obj :  .AUTODEPEND ..\..\src\msw\toplevel.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\corelib_uiaction.obj :  .AUTODEPEND ..\..\src\msw\uiaction.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\corelib_utilsgui.obj :  .AUTODEPEND ..\..\src\msw\utilsgui.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
@@ -13782,6 +13983,11 @@ $(OBJS)\corelib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_affinematrix2d.obj :  .AUTODEPEND ..\..\src\common\affinematrix2d.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -14158,11 +14364,11 @@ $(OBJS)\corelib_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\corelib_markupparser.obj :  .AUTODEPEND ..\..\src\common\markupparser.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\corelib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
@@ -14453,26 +14659,26 @@ $(OBJS)\corelib_logg.obj :  .AUTODEPEND ..\..\src\generic\logg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp
+$(OBJS)\corelib_markuptext.obj :  .AUTODEPEND ..\..\src\generic\markuptext.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp
+$(OBJS)\corelib_msgdlgg.obj :  .AUTODEPEND ..\..\src\generic\msgdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp
+$(OBJS)\corelib_numdlgg.obj :  .AUTODEPEND ..\..\src\generic\numdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_panelg.obj :  .AUTODEPEND ..\..\src\generic\panelg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
 $(OBJS)\corelib_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
@@ -14583,6 +14789,12 @@ $(OBJS)\advdll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
 $(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
@@ -14607,6 +14819,9 @@ $(OBJS)\advdll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
 $(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\advdll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
@@ -14664,6 +14879,9 @@ $(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 $(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\advdll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
@@ -14673,9 +14891,6 @@ $(OBJS)\advdll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 $(OBJS)\advdll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
-\r
 $(OBJS)\advdll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
@@ -14709,6 +14924,12 @@ $(OBJS)\advlib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
 $(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
@@ -14733,6 +14954,9 @@ $(OBJS)\advlib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
 $(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\advlib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
@@ -14790,6 +15014,9 @@ $(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
 $(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\advlib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
@@ -14799,9 +15026,6 @@ $(OBJS)\advlib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 $(OBJS)\advlib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
-\r
 $(OBJS)\advlib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
@@ -15015,6 +15239,33 @@ $(OBJS)\htmllib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\htmllib_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\webviewdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\webviewdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_WEBVIEW $<\r
+\r
+$(OBJS)\webviewdll_webview_ie.obj :  .AUTODEPEND ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\webviewdll_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\webviewdll_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\webviewlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\webviewlib_webview_ie.obj :  .AUTODEPEND ..\..\src\msw\webview_ie.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\webviewlib_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\webviewlib_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\qadll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $<\r
 \r
@@ -15066,6 +15317,9 @@ $(OBJS)\xrcdll_version.res :  .AUTODEPEND ..\..\src\msw\version.rc
 $(OBJS)\xrcdll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\xrcdll_xh_bannerwindow.obj :  .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\xrcdll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
 \r
@@ -15258,6 +15512,9 @@ $(OBJS)\xrclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\xrclib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\xrclib_xh_bannerwindow.obj :  .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\xrclib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
 \r
@@ -15621,67 +15878,67 @@ $(OBJS)\richtextdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\richtextdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $<\r
 \r
-$(OBJS)\richtextdll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
-\r
 $(OBJS)\richtextdll_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextdll_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
+$(OBJS)\richtextdll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextdll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\richtextdll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\richtextdll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextdll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\richtextdll_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextdll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\richtextdll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\richtextdll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextdll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\richtextdll_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextdll_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\richtextdll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
+$(OBJS)\richtextdll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
+$(OBJS)\richtextlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\richtextlib_richtextbuffer.obj :  .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
+$(OBJS)\richtextlib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
+$(OBJS)\richtextlib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\richtextlib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp\r
+$(OBJS)\richtextlib_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
+$(OBJS)\richtextlib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\richtextlib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp\r
+$(OBJS)\richtextlib_richtextstyles.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\richtextlib_richtextimagedlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp\r
+$(OBJS)\richtextlib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\richtextlib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\stcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r