X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5eda55f775832c1104451c490e2f7501c6f9a25c..e1efca652844273c3e8d32c7e5f442b87e455ca7:/build/msw/makefile.bcc

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index ebaec950f2..5dd84848d0 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.8 (http://www.bakefile.org)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -38,7 +38,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
 	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 COMPILER_PREFIX = bcc
 OBJS = \
 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -76,7 +76,6 @@ WXPNG_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 WXPNG_OBJECTS =  \
 	$(OBJS)\wxpng_png.obj \
 	$(OBJS)\wxpng_pngerror.obj \
-	$(OBJS)\wxpng_pnggccrd.obj \
 	$(OBJS)\wxpng_pngget.obj \
 	$(OBJS)\wxpng_pngmem.obj \
 	$(OBJS)\wxpng_pngpread.obj \
@@ -86,7 +85,6 @@ WXPNG_OBJECTS =  \
 	$(OBJS)\wxpng_pngrutil.obj \
 	$(OBJS)\wxpng_pngset.obj \
 	$(OBJS)\wxpng_pngtrans.obj \
-	$(OBJS)\wxpng_pngvcrd.obj \
 	$(OBJS)\wxpng_pngwio.obj \
 	$(OBJS)\wxpng_pngwrite.obj \
 	$(OBJS)\wxpng_pngwtran.obj \
@@ -195,7 +193,7 @@ WXSCINTILLA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	-I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \
 	-DSCI_LEXER -DLINK_LEXERS -w-8027 -I$(SETUPHDIR) -I..\..\include \
 	$(__wxscintilla_usingdll_p) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
+	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
 WXSCINTILLA_OBJECTS =  \
 	$(OBJS)\wxscintilla_AutoComplete.obj \
 	$(OBJS)\wxscintilla_CallTip.obj \
@@ -371,6 +369,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_mimecmn.obj \
 	$(OBJS)\monodll_module.obj \
 	$(OBJS)\monodll_mstream.obj \
+	$(OBJS)\monodll_numformatter.obj \
 	$(OBJS)\monodll_object.obj \
 	$(OBJS)\monodll_platinfo.obj \
 	$(OBJS)\monodll_powercmn.obj \
@@ -518,6 +517,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_mimecmn.obj \
 	$(OBJS)\monolib_module.obj \
 	$(OBJS)\monolib_mstream.obj \
+	$(OBJS)\monolib_numformatter.obj \
 	$(OBJS)\monolib_object.obj \
 	$(OBJS)\monolib_platinfo.obj \
 	$(OBJS)\monolib_powercmn.obj \
@@ -663,6 +663,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_mimecmn.obj \
 	$(OBJS)\basedll_module.obj \
 	$(OBJS)\basedll_mstream.obj \
+	$(OBJS)\basedll_numformatter.obj \
 	$(OBJS)\basedll_object.obj \
 	$(OBJS)\basedll_platinfo.obj \
 	$(OBJS)\basedll_powercmn.obj \
@@ -792,6 +793,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_mimecmn.obj \
 	$(OBJS)\baselib_module.obj \
 	$(OBJS)\baselib_mstream.obj \
+	$(OBJS)\baselib_numformatter.obj \
 	$(OBJS)\baselib_object.obj \
 	$(OBJS)\baselib_platinfo.obj \
 	$(OBJS)\baselib_powercmn.obj \
@@ -1144,6 +1146,7 @@ XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_xh_choic.obj \
 	$(OBJS)\xrcdll_xh_choicbk.obj \
 	$(OBJS)\xrcdll_xh_clrpicker.obj \
+	$(OBJS)\xrcdll_xh_cmdlinkbn.obj \
 	$(OBJS)\xrcdll_xh_collpane.obj \
 	$(OBJS)\xrcdll_xh_combo.obj \
 	$(OBJS)\xrcdll_xh_comboctrl.obj \
@@ -1187,6 +1190,7 @@ XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_xh_text.obj \
 	$(OBJS)\xrcdll_xh_tglbtn.obj \
 	$(OBJS)\xrcdll_xh_toolb.obj \
+	$(OBJS)\xrcdll_xh_toolbk.obj \
 	$(OBJS)\xrcdll_xh_tree.obj \
 	$(OBJS)\xrcdll_xh_treebk.obj \
 	$(OBJS)\xrcdll_xh_unkwn.obj \
@@ -1216,6 +1220,7 @@ XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_xh_choic.obj \
 	$(OBJS)\xrclib_xh_choicbk.obj \
 	$(OBJS)\xrclib_xh_clrpicker.obj \
+	$(OBJS)\xrclib_xh_cmdlinkbn.obj \
 	$(OBJS)\xrclib_xh_collpane.obj \
 	$(OBJS)\xrclib_xh_combo.obj \
 	$(OBJS)\xrclib_xh_comboctrl.obj \
@@ -1259,6 +1264,7 @@ XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_xh_text.obj \
 	$(OBJS)\xrclib_xh_tglbtn.obj \
 	$(OBJS)\xrclib_xh_toolb.obj \
+	$(OBJS)\xrclib_xh_toolbk.obj \
 	$(OBJS)\xrclib_xh_tree.obj \
 	$(OBJS)\xrclib_xh_treebk.obj \
 	$(OBJS)\xrclib_xh_unkwn.obj \
@@ -1391,15 +1397,16 @@ RICHTEXTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	-H=$(OBJS)\wxprec_richtextdll.csm $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  \
 	$(OBJS)\richtextdll_dummy.obj \
-	$(OBJS)\richtextdll_richtextctrl.obj \
 	$(OBJS)\richtextdll_richtextbuffer.obj \
-	$(OBJS)\richtextdll_richtextstyles.obj \
-	$(OBJS)\richtextdll_richtextxml.obj \
-	$(OBJS)\richtextdll_richtexthtml.obj \
+	$(OBJS)\richtextdll_richtextctrl.obj \
 	$(OBJS)\richtextdll_richtextformatdlg.obj \
-	$(OBJS)\richtextdll_richtextsymboldlg.obj \
+	$(OBJS)\richtextdll_richtexthtml.obj \
+	$(OBJS)\richtextdll_richtextimagedlg.obj \
+	$(OBJS)\richtextdll_richtextprint.obj \
 	$(OBJS)\richtextdll_richtextstyledlg.obj \
-	$(OBJS)\richtextdll_richtextprint.obj
+	$(OBJS)\richtextdll_richtextstyles.obj \
+	$(OBJS)\richtextdll_richtextsymboldlg.obj \
+	$(OBJS)\richtextdll_richtextxml.obj
 RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1411,15 +1418,16 @@ RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(CXXFLAGS)
 RICHTEXTLIB_OBJECTS =  \
 	$(OBJS)\richtextlib_dummy.obj \
-	$(OBJS)\richtextlib_richtextctrl.obj \
 	$(OBJS)\richtextlib_richtextbuffer.obj \
-	$(OBJS)\richtextlib_richtextstyles.obj \
-	$(OBJS)\richtextlib_richtextxml.obj \
-	$(OBJS)\richtextlib_richtexthtml.obj \
+	$(OBJS)\richtextlib_richtextctrl.obj \
 	$(OBJS)\richtextlib_richtextformatdlg.obj \
-	$(OBJS)\richtextlib_richtextsymboldlg.obj \
+	$(OBJS)\richtextlib_richtexthtml.obj \
+	$(OBJS)\richtextlib_richtextimagedlg.obj \
+	$(OBJS)\richtextlib_richtextprint.obj \
 	$(OBJS)\richtextlib_richtextstyledlg.obj \
-	$(OBJS)\richtextlib_richtextprint.obj
+	$(OBJS)\richtextlib_richtextstyles.obj \
+	$(OBJS)\richtextlib_richtextsymboldlg.obj \
+	$(OBJS)\richtextlib_richtextxml.obj
 STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1580,6 +1588,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_choic.obj \
 	$(OBJS)\monodll_xh_choicbk.obj \
 	$(OBJS)\monodll_xh_clrpicker.obj \
+	$(OBJS)\monodll_xh_cmdlinkbn.obj \
 	$(OBJS)\monodll_xh_collpane.obj \
 	$(OBJS)\monodll_xh_combo.obj \
 	$(OBJS)\monodll_xh_comboctrl.obj \
@@ -1623,6 +1632,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_text.obj \
 	$(OBJS)\monodll_xh_tglbtn.obj \
 	$(OBJS)\monodll_xh_toolb.obj \
+	$(OBJS)\monodll_xh_toolbk.obj \
 	$(OBJS)\monodll_xh_tree.obj \
 	$(OBJS)\monodll_xh_treebk.obj \
 	$(OBJS)\monodll_xh_unkwn.obj \
@@ -1652,17 +1662,18 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_ribbon_control.obj \
 	$(OBJS)\monodll_gallery.obj \
 	$(OBJS)\monodll_page.obj \
-	$(OBJS)\monodll_panel.obj \
+	$(OBJS)\monodll_ribbon_panel.obj \
 	$(OBJS)\monodll_ribbon_toolbar.obj \
-	$(OBJS)\monodll_richtextctrl.obj \
 	$(OBJS)\monodll_richtextbuffer.obj \
-	$(OBJS)\monodll_richtextstyles.obj \
-	$(OBJS)\monodll_richtextxml.obj \
-	$(OBJS)\monodll_richtexthtml.obj \
+	$(OBJS)\monodll_richtextctrl.obj \
 	$(OBJS)\monodll_richtextformatdlg.obj \
-	$(OBJS)\monodll_richtextsymboldlg.obj \
-	$(OBJS)\monodll_richtextstyledlg.obj \
+	$(OBJS)\monodll_richtexthtml.obj \
+	$(OBJS)\monodll_richtextimagedlg.obj \
 	$(OBJS)\monodll_richtextprint.obj \
+	$(OBJS)\monodll_richtextstyledlg.obj \
+	$(OBJS)\monodll_richtextstyles.obj \
+	$(OBJS)\monodll_richtextsymboldlg.obj \
+	$(OBJS)\monodll_richtextxml.obj \
 	$(OBJS)\monodll_stc.obj \
 	$(OBJS)\monodll_PlatWX.obj \
 	$(OBJS)\monodll_ScintillaWX.obj
@@ -1711,6 +1722,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_settings.obj \
 	$(OBJS)\monodll_tooltip.obj \
 	$(OBJS)\monodll_toplevel.obj \
+	$(OBJS)\monodll_uiaction.obj \
 	$(OBJS)\monodll_utilsgui.obj \
 	$(OBJS)\monodll_uxtheme.obj \
 	$(OBJS)\monodll_window.obj \
@@ -1725,6 +1737,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_generic_statusbr.obj \
 	$(OBJS)\monodll_prntdlgg.obj \
 	$(OBJS)\monodll_msw_accel.obj \
+	$(OBJS)\monodll_anybutton.obj \
 	$(OBJS)\monodll_artmsw.obj \
 	$(OBJS)\monodll_msw_bmpbuttn.obj \
 	$(OBJS)\monodll_msw_button.obj \
@@ -1754,6 +1767,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_notebook.obj \
 	$(OBJS)\monodll_access.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
+	$(OBJS)\monodll_msw_panel.obj \
 	$(OBJS)\monodll_progdlg.obj \
 	$(OBJS)\monodll_msw_radiobox.obj \
 	$(OBJS)\monodll_msw_radiobut.obj \
@@ -1772,24 +1786,29 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_textentry.obj \
 	$(OBJS)\monodll_msw_tglbtn.obj \
 	$(OBJS)\monodll_treectrl.obj \
-	$(OBJS)\monodll_uiaction.obj \
 	$(OBJS)\monodll_msw_checklst.obj \
 	$(OBJS)\monodll_msw_fdrepdlg.obj \
 	$(OBJS)\monodll_fontdlg.obj \
 	$(OBJS)\monodll_accelcmn.obj \
 	$(OBJS)\monodll_accesscmn.obj \
 	$(OBJS)\monodll_anidecod.obj \
+	$(OBJS)\monodll_affinematrix2d.obj \
 	$(OBJS)\monodll_appcmn.obj \
 	$(OBJS)\monodll_artprov.obj \
 	$(OBJS)\monodll_artstd.obj \
+	$(OBJS)\monodll_arttango.obj \
 	$(OBJS)\monodll_bmpbase.obj \
+	$(OBJS)\monodll_bmpbtncmn.obj \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_btncmn.obj \
 	$(OBJS)\monodll_cairo.obj \
+	$(OBJS)\monodll_checkboxcmn.obj \
+	$(OBJS)\monodll_checklstcmn.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
 	$(OBJS)\monodll_clrpickercmn.obj \
 	$(OBJS)\monodll_colourcmn.obj \
+	$(OBJS)\monodll_colourdata.obj \
 	$(OBJS)\monodll_combocmn.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
@@ -1797,11 +1816,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.obj \
 	$(OBJS)\monodll_ctrlcmn.obj \
 	$(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj \
 	$(OBJS)\monodll_dcbase.obj \
 	$(OBJS)\monodll_dcbufcmn.obj \
 	$(OBJS)\monodll_dcgraph.obj \
 	$(OBJS)\monodll_dcsvg.obj \
+	$(OBJS)\monodll_dirctrlcmn.obj \
 	$(OBJS)\monodll_dlgcmn.obj \
 	$(OBJS)\monodll_dndcmn.obj \
 	$(OBJS)\monodll_dobjcmn.obj \
@@ -1817,6 +1836,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontpickercmn.obj \
 	$(OBJS)\monodll_fldlgcmn.obj \
 	$(OBJS)\monodll_fontcmn.obj \
+	$(OBJS)\monodll_fontdata.obj \
 	$(OBJS)\monodll_graphicc.obj \
 	$(OBJS)\monodll_fontenumcmn.obj \
 	$(OBJS)\monodll_fontmap.obj \
@@ -1848,6 +1868,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_layout.obj \
 	$(OBJS)\monodll_lboxcmn.obj \
 	$(OBJS)\monodll_listctrlcmn.obj \
+	$(OBJS)\monodll_markupparser.obj \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
 	$(OBJS)\monodll_mousemanager.obj \
@@ -1855,20 +1876,28 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_overlaycmn.obj \
 	$(OBJS)\monodll_ownerdrwcmn.obj \
 	$(OBJS)\monodll_paper.obj \
+	$(OBJS)\monodll_panelcmn.obj \
 	$(OBJS)\monodll_persist.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
 	$(OBJS)\monodll_prntbase.obj \
 	$(OBJS)\monodll_quantize.obj \
+	$(OBJS)\monodll_radiobtncmn.obj \
 	$(OBJS)\monodll_radiocmn.obj \
 	$(OBJS)\monodll_rearrangectrl.obj \
 	$(OBJS)\monodll_rendcmn.obj \
 	$(OBJS)\monodll_rgncmn.obj \
+	$(OBJS)\monodll_scrolbarcmn.obj \
 	$(OBJS)\monodll_settcmn.obj \
 	$(OBJS)\monodll_sizer.obj \
+	$(OBJS)\monodll_slidercmn.obj \
+	$(OBJS)\monodll_spinbtncmn.obj \
 	$(OBJS)\monodll_spinctrlcmn.obj \
 	$(OBJS)\monodll_srchcmn.obj \
 	$(OBJS)\monodll_statbar.obj \
+	$(OBJS)\monodll_statbmpcmn.obj \
+	$(OBJS)\monodll_statboxcmn.obj \
+	$(OBJS)\monodll_statlinecmn.obj \
 	$(OBJS)\monodll_stattextcmn.obj \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
@@ -1880,6 +1909,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valgen.obj \
 	$(OBJS)\monodll_validate.obj \
 	$(OBJS)\monodll_valtext.obj \
+	$(OBJS)\monodll_valnum.obj \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_windowid.obj \
 	$(OBJS)\monodll_wrapsizer.obj \
@@ -1897,6 +1927,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
+	$(OBJS)\monodll_markuptext.obj \
 	$(OBJS)\monodll_msgdlgg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_panelg.obj \
@@ -1963,6 +1994,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_settings.obj \
 	$(OBJS)\monodll_tooltip.obj \
 	$(OBJS)\monodll_toplevel.obj \
+	$(OBJS)\monodll_uiaction.obj \
 	$(OBJS)\monodll_utilsgui.obj \
 	$(OBJS)\monodll_uxtheme.obj \
 	$(OBJS)\monodll_window.obj \
@@ -2026,17 +2058,23 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_accelcmn.obj \
 	$(OBJS)\monodll_accesscmn.obj \
 	$(OBJS)\monodll_anidecod.obj \
+	$(OBJS)\monodll_affinematrix2d.obj \
 	$(OBJS)\monodll_appcmn.obj \
 	$(OBJS)\monodll_artprov.obj \
 	$(OBJS)\monodll_artstd.obj \
+	$(OBJS)\monodll_arttango.obj \
 	$(OBJS)\monodll_bmpbase.obj \
+	$(OBJS)\monodll_bmpbtncmn.obj \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_btncmn.obj \
 	$(OBJS)\monodll_cairo.obj \
+	$(OBJS)\monodll_checkboxcmn.obj \
+	$(OBJS)\monodll_checklstcmn.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
 	$(OBJS)\monodll_clrpickercmn.obj \
 	$(OBJS)\monodll_colourcmn.obj \
+	$(OBJS)\monodll_colourdata.obj \
 	$(OBJS)\monodll_combocmn.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
@@ -2044,11 +2082,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cshelp.obj \
 	$(OBJS)\monodll_ctrlcmn.obj \
 	$(OBJS)\monodll_ctrlsub.obj \
-	$(OBJS)\monodll_datacmn.obj \
 	$(OBJS)\monodll_dcbase.obj \
 	$(OBJS)\monodll_dcbufcmn.obj \
 	$(OBJS)\monodll_dcgraph.obj \
 	$(OBJS)\monodll_dcsvg.obj \
+	$(OBJS)\monodll_dirctrlcmn.obj \
 	$(OBJS)\monodll_dlgcmn.obj \
 	$(OBJS)\monodll_dndcmn.obj \
 	$(OBJS)\monodll_dobjcmn.obj \
@@ -2064,6 +2102,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontpickercmn.obj \
 	$(OBJS)\monodll_fldlgcmn.obj \
 	$(OBJS)\monodll_fontcmn.obj \
+	$(OBJS)\monodll_fontdata.obj \
 	$(OBJS)\monodll_graphicc.obj \
 	$(OBJS)\monodll_fontenumcmn.obj \
 	$(OBJS)\monodll_fontmap.obj \
@@ -2095,6 +2134,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_layout.obj \
 	$(OBJS)\monodll_lboxcmn.obj \
 	$(OBJS)\monodll_listctrlcmn.obj \
+	$(OBJS)\monodll_markupparser.obj \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
 	$(OBJS)\monodll_mousemanager.obj \
@@ -2102,20 +2142,28 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_overlaycmn.obj \
 	$(OBJS)\monodll_ownerdrwcmn.obj \
 	$(OBJS)\monodll_paper.obj \
+	$(OBJS)\monodll_panelcmn.obj \
 	$(OBJS)\monodll_persist.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
 	$(OBJS)\monodll_prntbase.obj \
 	$(OBJS)\monodll_quantize.obj \
+	$(OBJS)\monodll_radiobtncmn.obj \
 	$(OBJS)\monodll_radiocmn.obj \
 	$(OBJS)\monodll_rearrangectrl.obj \
 	$(OBJS)\monodll_rendcmn.obj \
 	$(OBJS)\monodll_rgncmn.obj \
+	$(OBJS)\monodll_scrolbarcmn.obj \
 	$(OBJS)\monodll_settcmn.obj \
 	$(OBJS)\monodll_sizer.obj \
+	$(OBJS)\monodll_slidercmn.obj \
+	$(OBJS)\monodll_spinbtncmn.obj \
 	$(OBJS)\monodll_spinctrlcmn.obj \
 	$(OBJS)\monodll_srchcmn.obj \
 	$(OBJS)\monodll_statbar.obj \
+	$(OBJS)\monodll_statbmpcmn.obj \
+	$(OBJS)\monodll_statboxcmn.obj \
+	$(OBJS)\monodll_statlinecmn.obj \
 	$(OBJS)\monodll_stattextcmn.obj \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
@@ -2127,6 +2175,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_valgen.obj \
 	$(OBJS)\monodll_validate.obj \
 	$(OBJS)\monodll_valtext.obj \
+	$(OBJS)\monodll_valnum.obj \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_windowid.obj \
 	$(OBJS)\monodll_wrapsizer.obj \
@@ -2144,6 +2193,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
+	$(OBJS)\monodll_markuptext.obj \
 	$(OBJS)\monodll_msgdlgg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_panelg.obj \
@@ -2172,7 +2222,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bmpcboxcmn.obj \
 	$(OBJS)\monodll_calctrlcmn.obj \
 	$(OBJS)\monodll_datavcmn.obj \
+	$(OBJS)\monodll_gridcmn.obj \
 	$(OBJS)\monodll_hyperlnkcmn.obj \
+	$(OBJS)\monodll_odcombocmn.obj \
 	$(OBJS)\monodll_aboutdlgg.obj \
 	$(OBJS)\monodll_bmpcboxg.obj \
 	$(OBJS)\monodll_calctrlg.obj \
@@ -2196,8 +2248,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wizard.obj \
 	$(OBJS)\monodll_taskbarcmn.obj \
 	$(OBJS)\monodll_aboutdlg.obj \
-	$(OBJS)\monodll_commandlinkbutton.obj \
-	$(OBJS)\monodll_hyperlink.obj \
 	$(OBJS)\monodll_notifmsg.obj \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_taskbar.obj \
@@ -2205,8 +2255,10 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_bmpcbox.obj \
 	$(OBJS)\monodll_calctrl.obj \
+	$(OBJS)\monodll_commandlinkbutton.obj \
 	$(OBJS)\monodll_datecontrols.obj \
-	$(OBJS)\monodll_datectrl.obj
+	$(OBJS)\monodll_datectrl.obj \
+	$(OBJS)\monodll_hyperlink.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
@@ -2214,7 +2266,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bmpcboxcmn.obj \
 	$(OBJS)\monodll_calctrlcmn.obj \
 	$(OBJS)\monodll_datavcmn.obj \
+	$(OBJS)\monodll_gridcmn.obj \
 	$(OBJS)\monodll_hyperlnkcmn.obj \
+	$(OBJS)\monodll_odcombocmn.obj \
 	$(OBJS)\monodll_aboutdlgg.obj \
 	$(OBJS)\monodll_bmpcboxg.obj \
 	$(OBJS)\monodll_calctrlg.obj \
@@ -2238,8 +2292,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wizard.obj \
 	$(OBJS)\monodll_taskbarcmn.obj \
 	$(OBJS)\monodll_aboutdlg.obj \
-	$(OBJS)\monodll_commandlinkbutton.obj \
-	$(OBJS)\monodll_hyperlink.obj \
 	$(OBJS)\monodll_notifmsg.obj \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_taskbar.obj \
@@ -2300,6 +2352,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_choic.obj \
 	$(OBJS)\monolib_xh_choicbk.obj \
 	$(OBJS)\monolib_xh_clrpicker.obj \
+	$(OBJS)\monolib_xh_cmdlinkbn.obj \
 	$(OBJS)\monolib_xh_collpane.obj \
 	$(OBJS)\monolib_xh_combo.obj \
 	$(OBJS)\monolib_xh_comboctrl.obj \
@@ -2343,6 +2396,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_text.obj \
 	$(OBJS)\monolib_xh_tglbtn.obj \
 	$(OBJS)\monolib_xh_toolb.obj \
+	$(OBJS)\monolib_xh_toolbk.obj \
 	$(OBJS)\monolib_xh_tree.obj \
 	$(OBJS)\monolib_xh_treebk.obj \
 	$(OBJS)\monolib_xh_unkwn.obj \
@@ -2372,17 +2426,18 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_ribbon_control.obj \
 	$(OBJS)\monolib_gallery.obj \
 	$(OBJS)\monolib_page.obj \
-	$(OBJS)\monolib_panel.obj \
+	$(OBJS)\monolib_ribbon_panel.obj \
 	$(OBJS)\monolib_ribbon_toolbar.obj \
-	$(OBJS)\monolib_richtextctrl.obj \
 	$(OBJS)\monolib_richtextbuffer.obj \
-	$(OBJS)\monolib_richtextstyles.obj \
-	$(OBJS)\monolib_richtextxml.obj \
-	$(OBJS)\monolib_richtexthtml.obj \
+	$(OBJS)\monolib_richtextctrl.obj \
 	$(OBJS)\monolib_richtextformatdlg.obj \
-	$(OBJS)\monolib_richtextsymboldlg.obj \
-	$(OBJS)\monolib_richtextstyledlg.obj \
+	$(OBJS)\monolib_richtexthtml.obj \
+	$(OBJS)\monolib_richtextimagedlg.obj \
 	$(OBJS)\monolib_richtextprint.obj \
+	$(OBJS)\monolib_richtextstyledlg.obj \
+	$(OBJS)\monolib_richtextstyles.obj \
+	$(OBJS)\monolib_richtextsymboldlg.obj \
+	$(OBJS)\monolib_richtextxml.obj \
 	$(OBJS)\monolib_stc.obj \
 	$(OBJS)\monolib_PlatWX.obj \
 	$(OBJS)\monolib_ScintillaWX.obj
@@ -2431,6 +2486,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_settings.obj \
 	$(OBJS)\monolib_tooltip.obj \
 	$(OBJS)\monolib_toplevel.obj \
+	$(OBJS)\monolib_uiaction.obj \
 	$(OBJS)\monolib_utilsgui.obj \
 	$(OBJS)\monolib_uxtheme.obj \
 	$(OBJS)\monolib_window.obj \
@@ -2445,6 +2501,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_generic_statusbr.obj \
 	$(OBJS)\monolib_prntdlgg.obj \
 	$(OBJS)\monolib_msw_accel.obj \
+	$(OBJS)\monolib_anybutton.obj \
 	$(OBJS)\monolib_artmsw.obj \
 	$(OBJS)\monolib_msw_bmpbuttn.obj \
 	$(OBJS)\monolib_msw_button.obj \
@@ -2474,6 +2531,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_notebook.obj \
 	$(OBJS)\monolib_access.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
+	$(OBJS)\monolib_msw_panel.obj \
 	$(OBJS)\monolib_progdlg.obj \
 	$(OBJS)\monolib_msw_radiobox.obj \
 	$(OBJS)\monolib_msw_radiobut.obj \
@@ -2492,24 +2550,29 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_textentry.obj \
 	$(OBJS)\monolib_msw_tglbtn.obj \
 	$(OBJS)\monolib_treectrl.obj \
-	$(OBJS)\monolib_uiaction.obj \
 	$(OBJS)\monolib_msw_checklst.obj \
 	$(OBJS)\monolib_msw_fdrepdlg.obj \
 	$(OBJS)\monolib_fontdlg.obj \
 	$(OBJS)\monolib_accelcmn.obj \
 	$(OBJS)\monolib_accesscmn.obj \
 	$(OBJS)\monolib_anidecod.obj \
+	$(OBJS)\monolib_affinematrix2d.obj \
 	$(OBJS)\monolib_appcmn.obj \
 	$(OBJS)\monolib_artprov.obj \
 	$(OBJS)\monolib_artstd.obj \
+	$(OBJS)\monolib_arttango.obj \
 	$(OBJS)\monolib_bmpbase.obj \
+	$(OBJS)\monolib_bmpbtncmn.obj \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_btncmn.obj \
 	$(OBJS)\monolib_cairo.obj \
+	$(OBJS)\monolib_checkboxcmn.obj \
+	$(OBJS)\monolib_checklstcmn.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
 	$(OBJS)\monolib_clrpickercmn.obj \
 	$(OBJS)\monolib_colourcmn.obj \
+	$(OBJS)\monolib_colourdata.obj \
 	$(OBJS)\monolib_combocmn.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
@@ -2517,11 +2580,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.obj \
 	$(OBJS)\monolib_ctrlcmn.obj \
 	$(OBJS)\monolib_ctrlsub.obj \
-	$(OBJS)\monolib_datacmn.obj \
 	$(OBJS)\monolib_dcbase.obj \
 	$(OBJS)\monolib_dcbufcmn.obj \
 	$(OBJS)\monolib_dcgraph.obj \
 	$(OBJS)\monolib_dcsvg.obj \
+	$(OBJS)\monolib_dirctrlcmn.obj \
 	$(OBJS)\monolib_dlgcmn.obj \
 	$(OBJS)\monolib_dndcmn.obj \
 	$(OBJS)\monolib_dobjcmn.obj \
@@ -2537,6 +2600,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontpickercmn.obj \
 	$(OBJS)\monolib_fldlgcmn.obj \
 	$(OBJS)\monolib_fontcmn.obj \
+	$(OBJS)\monolib_fontdata.obj \
 	$(OBJS)\monolib_graphicc.obj \
 	$(OBJS)\monolib_fontenumcmn.obj \
 	$(OBJS)\monolib_fontmap.obj \
@@ -2568,6 +2632,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_layout.obj \
 	$(OBJS)\monolib_lboxcmn.obj \
 	$(OBJS)\monolib_listctrlcmn.obj \
+	$(OBJS)\monolib_markupparser.obj \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
 	$(OBJS)\monolib_mousemanager.obj \
@@ -2575,20 +2640,28 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_overlaycmn.obj \
 	$(OBJS)\monolib_ownerdrwcmn.obj \
 	$(OBJS)\monolib_paper.obj \
+	$(OBJS)\monolib_panelcmn.obj \
 	$(OBJS)\monolib_persist.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
 	$(OBJS)\monolib_prntbase.obj \
 	$(OBJS)\monolib_quantize.obj \
+	$(OBJS)\monolib_radiobtncmn.obj \
 	$(OBJS)\monolib_radiocmn.obj \
 	$(OBJS)\monolib_rearrangectrl.obj \
 	$(OBJS)\monolib_rendcmn.obj \
 	$(OBJS)\monolib_rgncmn.obj \
+	$(OBJS)\monolib_scrolbarcmn.obj \
 	$(OBJS)\monolib_settcmn.obj \
 	$(OBJS)\monolib_sizer.obj \
+	$(OBJS)\monolib_slidercmn.obj \
+	$(OBJS)\monolib_spinbtncmn.obj \
 	$(OBJS)\monolib_spinctrlcmn.obj \
 	$(OBJS)\monolib_srchcmn.obj \
 	$(OBJS)\monolib_statbar.obj \
+	$(OBJS)\monolib_statbmpcmn.obj \
+	$(OBJS)\monolib_statboxcmn.obj \
+	$(OBJS)\monolib_statlinecmn.obj \
 	$(OBJS)\monolib_stattextcmn.obj \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
@@ -2600,6 +2673,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valgen.obj \
 	$(OBJS)\monolib_validate.obj \
 	$(OBJS)\monolib_valtext.obj \
+	$(OBJS)\monolib_valnum.obj \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_windowid.obj \
 	$(OBJS)\monolib_wrapsizer.obj \
@@ -2617,6 +2691,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
+	$(OBJS)\monolib_markuptext.obj \
 	$(OBJS)\monolib_msgdlgg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_panelg.obj \
@@ -2683,6 +2758,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_settings.obj \
 	$(OBJS)\monolib_tooltip.obj \
 	$(OBJS)\monolib_toplevel.obj \
+	$(OBJS)\monolib_uiaction.obj \
 	$(OBJS)\monolib_utilsgui.obj \
 	$(OBJS)\monolib_uxtheme.obj \
 	$(OBJS)\monolib_window.obj \
@@ -2746,17 +2822,23 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_accelcmn.obj \
 	$(OBJS)\monolib_accesscmn.obj \
 	$(OBJS)\monolib_anidecod.obj \
+	$(OBJS)\monolib_affinematrix2d.obj \
 	$(OBJS)\monolib_appcmn.obj \
 	$(OBJS)\monolib_artprov.obj \
 	$(OBJS)\monolib_artstd.obj \
+	$(OBJS)\monolib_arttango.obj \
 	$(OBJS)\monolib_bmpbase.obj \
+	$(OBJS)\monolib_bmpbtncmn.obj \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_btncmn.obj \
 	$(OBJS)\monolib_cairo.obj \
+	$(OBJS)\monolib_checkboxcmn.obj \
+	$(OBJS)\monolib_checklstcmn.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
 	$(OBJS)\monolib_clrpickercmn.obj \
 	$(OBJS)\monolib_colourcmn.obj \
+	$(OBJS)\monolib_colourdata.obj \
 	$(OBJS)\monolib_combocmn.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
@@ -2764,11 +2846,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cshelp.obj \
 	$(OBJS)\monolib_ctrlcmn.obj \
 	$(OBJS)\monolib_ctrlsub.obj \
-	$(OBJS)\monolib_datacmn.obj \
 	$(OBJS)\monolib_dcbase.obj \
 	$(OBJS)\monolib_dcbufcmn.obj \
 	$(OBJS)\monolib_dcgraph.obj \
 	$(OBJS)\monolib_dcsvg.obj \
+	$(OBJS)\monolib_dirctrlcmn.obj \
 	$(OBJS)\monolib_dlgcmn.obj \
 	$(OBJS)\monolib_dndcmn.obj \
 	$(OBJS)\monolib_dobjcmn.obj \
@@ -2784,6 +2866,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontpickercmn.obj \
 	$(OBJS)\monolib_fldlgcmn.obj \
 	$(OBJS)\monolib_fontcmn.obj \
+	$(OBJS)\monolib_fontdata.obj \
 	$(OBJS)\monolib_graphicc.obj \
 	$(OBJS)\monolib_fontenumcmn.obj \
 	$(OBJS)\monolib_fontmap.obj \
@@ -2815,6 +2898,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_layout.obj \
 	$(OBJS)\monolib_lboxcmn.obj \
 	$(OBJS)\monolib_listctrlcmn.obj \
+	$(OBJS)\monolib_markupparser.obj \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
 	$(OBJS)\monolib_mousemanager.obj \
@@ -2822,20 +2906,28 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_overlaycmn.obj \
 	$(OBJS)\monolib_ownerdrwcmn.obj \
 	$(OBJS)\monolib_paper.obj \
+	$(OBJS)\monolib_panelcmn.obj \
 	$(OBJS)\monolib_persist.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
 	$(OBJS)\monolib_prntbase.obj \
 	$(OBJS)\monolib_quantize.obj \
+	$(OBJS)\monolib_radiobtncmn.obj \
 	$(OBJS)\monolib_radiocmn.obj \
 	$(OBJS)\monolib_rearrangectrl.obj \
 	$(OBJS)\monolib_rendcmn.obj \
 	$(OBJS)\monolib_rgncmn.obj \
+	$(OBJS)\monolib_scrolbarcmn.obj \
 	$(OBJS)\monolib_settcmn.obj \
 	$(OBJS)\monolib_sizer.obj \
+	$(OBJS)\monolib_slidercmn.obj \
+	$(OBJS)\monolib_spinbtncmn.obj \
 	$(OBJS)\monolib_spinctrlcmn.obj \
 	$(OBJS)\monolib_srchcmn.obj \
 	$(OBJS)\monolib_statbar.obj \
+	$(OBJS)\monolib_statbmpcmn.obj \
+	$(OBJS)\monolib_statboxcmn.obj \
+	$(OBJS)\monolib_statlinecmn.obj \
 	$(OBJS)\monolib_stattextcmn.obj \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
@@ -2847,6 +2939,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_valgen.obj \
 	$(OBJS)\monolib_validate.obj \
 	$(OBJS)\monolib_valtext.obj \
+	$(OBJS)\monolib_valnum.obj \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_windowid.obj \
 	$(OBJS)\monolib_wrapsizer.obj \
@@ -2864,6 +2957,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
+	$(OBJS)\monolib_markuptext.obj \
 	$(OBJS)\monolib_msgdlgg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_panelg.obj \
@@ -2892,7 +2986,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bmpcboxcmn.obj \
 	$(OBJS)\monolib_calctrlcmn.obj \
 	$(OBJS)\monolib_datavcmn.obj \
+	$(OBJS)\monolib_gridcmn.obj \
 	$(OBJS)\monolib_hyperlnkcmn.obj \
+	$(OBJS)\monolib_odcombocmn.obj \
 	$(OBJS)\monolib_aboutdlgg.obj \
 	$(OBJS)\monolib_bmpcboxg.obj \
 	$(OBJS)\monolib_calctrlg.obj \
@@ -2916,8 +3012,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wizard.obj \
 	$(OBJS)\monolib_taskbarcmn.obj \
 	$(OBJS)\monolib_aboutdlg.obj \
-	$(OBJS)\monolib_commandlinkbutton.obj \
-	$(OBJS)\monolib_hyperlink.obj \
 	$(OBJS)\monolib_notifmsg.obj \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_taskbar.obj \
@@ -2925,8 +3019,10 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_bmpcbox.obj \
 	$(OBJS)\monolib_calctrl.obj \
+	$(OBJS)\monolib_commandlinkbutton.obj \
 	$(OBJS)\monolib_datecontrols.obj \
-	$(OBJS)\monolib_datectrl.obj
+	$(OBJS)\monolib_datectrl.obj \
+	$(OBJS)\monolib_hyperlink.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
@@ -2934,7 +3030,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bmpcboxcmn.obj \
 	$(OBJS)\monolib_calctrlcmn.obj \
 	$(OBJS)\monolib_datavcmn.obj \
+	$(OBJS)\monolib_gridcmn.obj \
 	$(OBJS)\monolib_hyperlnkcmn.obj \
+	$(OBJS)\monolib_odcombocmn.obj \
 	$(OBJS)\monolib_aboutdlgg.obj \
 	$(OBJS)\monolib_bmpcboxg.obj \
 	$(OBJS)\monolib_calctrlg.obj \
@@ -2958,8 +3056,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wizard.obj \
 	$(OBJS)\monolib_taskbarcmn.obj \
 	$(OBJS)\monolib_aboutdlg.obj \
-	$(OBJS)\monolib_commandlinkbutton.obj \
-	$(OBJS)\monolib_hyperlink.obj \
 	$(OBJS)\monolib_notifmsg.obj \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_taskbar.obj \
@@ -3042,6 +3138,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_settings.obj \
 	$(OBJS)\coredll_tooltip.obj \
 	$(OBJS)\coredll_toplevel.obj \
+	$(OBJS)\coredll_uiaction.obj \
 	$(OBJS)\coredll_utilsgui.obj \
 	$(OBJS)\coredll_uxtheme.obj \
 	$(OBJS)\coredll_window.obj \
@@ -3056,6 +3153,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_generic_statusbr.obj \
 	$(OBJS)\coredll_prntdlgg.obj \
 	$(OBJS)\coredll_msw_accel.obj \
+	$(OBJS)\coredll_anybutton.obj \
 	$(OBJS)\coredll_artmsw.obj \
 	$(OBJS)\coredll_msw_bmpbuttn.obj \
 	$(OBJS)\coredll_msw_button.obj \
@@ -3085,6 +3183,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_notebook.obj \
 	$(OBJS)\coredll_access.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
+	$(OBJS)\coredll_panel.obj \
 	$(OBJS)\coredll_progdlg.obj \
 	$(OBJS)\coredll_msw_radiobox.obj \
 	$(OBJS)\coredll_msw_radiobut.obj \
@@ -3103,24 +3202,29 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_textentry.obj \
 	$(OBJS)\coredll_msw_tglbtn.obj \
 	$(OBJS)\coredll_treectrl.obj \
-	$(OBJS)\coredll_uiaction.obj \
 	$(OBJS)\coredll_msw_checklst.obj \
 	$(OBJS)\coredll_msw_fdrepdlg.obj \
 	$(OBJS)\coredll_fontdlg.obj \
 	$(OBJS)\coredll_accelcmn.obj \
 	$(OBJS)\coredll_accesscmn.obj \
 	$(OBJS)\coredll_anidecod.obj \
+	$(OBJS)\coredll_affinematrix2d.obj \
 	$(OBJS)\coredll_appcmn.obj \
 	$(OBJS)\coredll_artprov.obj \
 	$(OBJS)\coredll_artstd.obj \
+	$(OBJS)\coredll_arttango.obj \
 	$(OBJS)\coredll_bmpbase.obj \
+	$(OBJS)\coredll_bmpbtncmn.obj \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_btncmn.obj \
 	$(OBJS)\coredll_cairo.obj \
+	$(OBJS)\coredll_checkboxcmn.obj \
+	$(OBJS)\coredll_checklstcmn.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
 	$(OBJS)\coredll_clrpickercmn.obj \
 	$(OBJS)\coredll_colourcmn.obj \
+	$(OBJS)\coredll_colourdata.obj \
 	$(OBJS)\coredll_combocmn.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
@@ -3128,11 +3232,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.obj \
 	$(OBJS)\coredll_ctrlcmn.obj \
 	$(OBJS)\coredll_ctrlsub.obj \
-	$(OBJS)\coredll_datacmn.obj \
 	$(OBJS)\coredll_dcbase.obj \
 	$(OBJS)\coredll_dcbufcmn.obj \
 	$(OBJS)\coredll_dcgraph.obj \
 	$(OBJS)\coredll_dcsvg.obj \
+	$(OBJS)\coredll_dirctrlcmn.obj \
 	$(OBJS)\coredll_dlgcmn.obj \
 	$(OBJS)\coredll_dndcmn.obj \
 	$(OBJS)\coredll_dobjcmn.obj \
@@ -3148,6 +3252,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontpickercmn.obj \
 	$(OBJS)\coredll_fldlgcmn.obj \
 	$(OBJS)\coredll_fontcmn.obj \
+	$(OBJS)\coredll_fontdata.obj \
 	$(OBJS)\coredll_graphicc.obj \
 	$(OBJS)\coredll_fontenumcmn.obj \
 	$(OBJS)\coredll_fontmap.obj \
@@ -3179,6 +3284,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_layout.obj \
 	$(OBJS)\coredll_lboxcmn.obj \
 	$(OBJS)\coredll_listctrlcmn.obj \
+	$(OBJS)\coredll_markupparser.obj \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
 	$(OBJS)\coredll_mousemanager.obj \
@@ -3186,20 +3292,28 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_overlaycmn.obj \
 	$(OBJS)\coredll_ownerdrwcmn.obj \
 	$(OBJS)\coredll_paper.obj \
+	$(OBJS)\coredll_panelcmn.obj \
 	$(OBJS)\coredll_persist.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
 	$(OBJS)\coredll_prntbase.obj \
 	$(OBJS)\coredll_quantize.obj \
+	$(OBJS)\coredll_radiobtncmn.obj \
 	$(OBJS)\coredll_radiocmn.obj \
 	$(OBJS)\coredll_rearrangectrl.obj \
 	$(OBJS)\coredll_rendcmn.obj \
 	$(OBJS)\coredll_rgncmn.obj \
+	$(OBJS)\coredll_scrolbarcmn.obj \
 	$(OBJS)\coredll_settcmn.obj \
 	$(OBJS)\coredll_sizer.obj \
+	$(OBJS)\coredll_slidercmn.obj \
+	$(OBJS)\coredll_spinbtncmn.obj \
 	$(OBJS)\coredll_spinctrlcmn.obj \
 	$(OBJS)\coredll_srchcmn.obj \
 	$(OBJS)\coredll_statbar.obj \
+	$(OBJS)\coredll_statbmpcmn.obj \
+	$(OBJS)\coredll_statboxcmn.obj \
+	$(OBJS)\coredll_statlinecmn.obj \
 	$(OBJS)\coredll_stattextcmn.obj \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
@@ -3211,6 +3325,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valgen.obj \
 	$(OBJS)\coredll_validate.obj \
 	$(OBJS)\coredll_valtext.obj \
+	$(OBJS)\coredll_valnum.obj \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_windowid.obj \
 	$(OBJS)\coredll_wrapsizer.obj \
@@ -3228,6 +3343,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
+	$(OBJS)\coredll_markuptext.obj \
 	$(OBJS)\coredll_msgdlgg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_panelg.obj \
@@ -3294,6 +3410,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_settings.obj \
 	$(OBJS)\coredll_tooltip.obj \
 	$(OBJS)\coredll_toplevel.obj \
+	$(OBJS)\coredll_uiaction.obj \
 	$(OBJS)\coredll_utilsgui.obj \
 	$(OBJS)\coredll_uxtheme.obj \
 	$(OBJS)\coredll_window.obj \
@@ -3357,17 +3474,23 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_accelcmn.obj \
 	$(OBJS)\coredll_accesscmn.obj \
 	$(OBJS)\coredll_anidecod.obj \
+	$(OBJS)\coredll_affinematrix2d.obj \
 	$(OBJS)\coredll_appcmn.obj \
 	$(OBJS)\coredll_artprov.obj \
 	$(OBJS)\coredll_artstd.obj \
+	$(OBJS)\coredll_arttango.obj \
 	$(OBJS)\coredll_bmpbase.obj \
+	$(OBJS)\coredll_bmpbtncmn.obj \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_btncmn.obj \
 	$(OBJS)\coredll_cairo.obj \
+	$(OBJS)\coredll_checkboxcmn.obj \
+	$(OBJS)\coredll_checklstcmn.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
 	$(OBJS)\coredll_clrpickercmn.obj \
 	$(OBJS)\coredll_colourcmn.obj \
+	$(OBJS)\coredll_colourdata.obj \
 	$(OBJS)\coredll_combocmn.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
@@ -3375,11 +3498,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cshelp.obj \
 	$(OBJS)\coredll_ctrlcmn.obj \
 	$(OBJS)\coredll_ctrlsub.obj \
-	$(OBJS)\coredll_datacmn.obj \
 	$(OBJS)\coredll_dcbase.obj \
 	$(OBJS)\coredll_dcbufcmn.obj \
 	$(OBJS)\coredll_dcgraph.obj \
 	$(OBJS)\coredll_dcsvg.obj \
+	$(OBJS)\coredll_dirctrlcmn.obj \
 	$(OBJS)\coredll_dlgcmn.obj \
 	$(OBJS)\coredll_dndcmn.obj \
 	$(OBJS)\coredll_dobjcmn.obj \
@@ -3395,6 +3518,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontpickercmn.obj \
 	$(OBJS)\coredll_fldlgcmn.obj \
 	$(OBJS)\coredll_fontcmn.obj \
+	$(OBJS)\coredll_fontdata.obj \
 	$(OBJS)\coredll_graphicc.obj \
 	$(OBJS)\coredll_fontenumcmn.obj \
 	$(OBJS)\coredll_fontmap.obj \
@@ -3426,6 +3550,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_layout.obj \
 	$(OBJS)\coredll_lboxcmn.obj \
 	$(OBJS)\coredll_listctrlcmn.obj \
+	$(OBJS)\coredll_markupparser.obj \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
 	$(OBJS)\coredll_mousemanager.obj \
@@ -3433,20 +3558,28 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_overlaycmn.obj \
 	$(OBJS)\coredll_ownerdrwcmn.obj \
 	$(OBJS)\coredll_paper.obj \
+	$(OBJS)\coredll_panelcmn.obj \
 	$(OBJS)\coredll_persist.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
 	$(OBJS)\coredll_prntbase.obj \
 	$(OBJS)\coredll_quantize.obj \
+	$(OBJS)\coredll_radiobtncmn.obj \
 	$(OBJS)\coredll_radiocmn.obj \
 	$(OBJS)\coredll_rearrangectrl.obj \
 	$(OBJS)\coredll_rendcmn.obj \
 	$(OBJS)\coredll_rgncmn.obj \
+	$(OBJS)\coredll_scrolbarcmn.obj \
 	$(OBJS)\coredll_settcmn.obj \
 	$(OBJS)\coredll_sizer.obj \
+	$(OBJS)\coredll_slidercmn.obj \
+	$(OBJS)\coredll_spinbtncmn.obj \
 	$(OBJS)\coredll_spinctrlcmn.obj \
 	$(OBJS)\coredll_srchcmn.obj \
 	$(OBJS)\coredll_statbar.obj \
+	$(OBJS)\coredll_statbmpcmn.obj \
+	$(OBJS)\coredll_statboxcmn.obj \
+	$(OBJS)\coredll_statlinecmn.obj \
 	$(OBJS)\coredll_stattextcmn.obj \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
@@ -3458,6 +3591,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_valgen.obj \
 	$(OBJS)\coredll_validate.obj \
 	$(OBJS)\coredll_valtext.obj \
+	$(OBJS)\coredll_valnum.obj \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_windowid.obj \
 	$(OBJS)\coredll_wrapsizer.obj \
@@ -3475,6 +3609,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
+	$(OBJS)\coredll_markuptext.obj \
 	$(OBJS)\coredll_msgdlgg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_panelg.obj \
@@ -3545,6 +3680,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_settings.obj \
 	$(OBJS)\corelib_tooltip.obj \
 	$(OBJS)\corelib_toplevel.obj \
+	$(OBJS)\corelib_uiaction.obj \
 	$(OBJS)\corelib_utilsgui.obj \
 	$(OBJS)\corelib_uxtheme.obj \
 	$(OBJS)\corelib_window.obj \
@@ -3559,6 +3695,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_generic_statusbr.obj \
 	$(OBJS)\corelib_prntdlgg.obj \
 	$(OBJS)\corelib_msw_accel.obj \
+	$(OBJS)\corelib_anybutton.obj \
 	$(OBJS)\corelib_artmsw.obj \
 	$(OBJS)\corelib_msw_bmpbuttn.obj \
 	$(OBJS)\corelib_msw_button.obj \
@@ -3588,6 +3725,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_notebook.obj \
 	$(OBJS)\corelib_access.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
+	$(OBJS)\corelib_panel.obj \
 	$(OBJS)\corelib_progdlg.obj \
 	$(OBJS)\corelib_msw_radiobox.obj \
 	$(OBJS)\corelib_msw_radiobut.obj \
@@ -3606,24 +3744,29 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_textentry.obj \
 	$(OBJS)\corelib_msw_tglbtn.obj \
 	$(OBJS)\corelib_treectrl.obj \
-	$(OBJS)\corelib_uiaction.obj \
 	$(OBJS)\corelib_msw_checklst.obj \
 	$(OBJS)\corelib_msw_fdrepdlg.obj \
 	$(OBJS)\corelib_fontdlg.obj \
 	$(OBJS)\corelib_accelcmn.obj \
 	$(OBJS)\corelib_accesscmn.obj \
 	$(OBJS)\corelib_anidecod.obj \
+	$(OBJS)\corelib_affinematrix2d.obj \
 	$(OBJS)\corelib_appcmn.obj \
 	$(OBJS)\corelib_artprov.obj \
 	$(OBJS)\corelib_artstd.obj \
+	$(OBJS)\corelib_arttango.obj \
 	$(OBJS)\corelib_bmpbase.obj \
+	$(OBJS)\corelib_bmpbtncmn.obj \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_btncmn.obj \
 	$(OBJS)\corelib_cairo.obj \
+	$(OBJS)\corelib_checkboxcmn.obj \
+	$(OBJS)\corelib_checklstcmn.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
 	$(OBJS)\corelib_clrpickercmn.obj \
 	$(OBJS)\corelib_colourcmn.obj \
+	$(OBJS)\corelib_colourdata.obj \
 	$(OBJS)\corelib_combocmn.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
@@ -3631,11 +3774,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.obj \
 	$(OBJS)\corelib_ctrlcmn.obj \
 	$(OBJS)\corelib_ctrlsub.obj \
-	$(OBJS)\corelib_datacmn.obj \
 	$(OBJS)\corelib_dcbase.obj \
 	$(OBJS)\corelib_dcbufcmn.obj \
 	$(OBJS)\corelib_dcgraph.obj \
 	$(OBJS)\corelib_dcsvg.obj \
+	$(OBJS)\corelib_dirctrlcmn.obj \
 	$(OBJS)\corelib_dlgcmn.obj \
 	$(OBJS)\corelib_dndcmn.obj \
 	$(OBJS)\corelib_dobjcmn.obj \
@@ -3651,6 +3794,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontpickercmn.obj \
 	$(OBJS)\corelib_fldlgcmn.obj \
 	$(OBJS)\corelib_fontcmn.obj \
+	$(OBJS)\corelib_fontdata.obj \
 	$(OBJS)\corelib_graphicc.obj \
 	$(OBJS)\corelib_fontenumcmn.obj \
 	$(OBJS)\corelib_fontmap.obj \
@@ -3682,6 +3826,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_layout.obj \
 	$(OBJS)\corelib_lboxcmn.obj \
 	$(OBJS)\corelib_listctrlcmn.obj \
+	$(OBJS)\corelib_markupparser.obj \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
 	$(OBJS)\corelib_mousemanager.obj \
@@ -3689,20 +3834,28 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_overlaycmn.obj \
 	$(OBJS)\corelib_ownerdrwcmn.obj \
 	$(OBJS)\corelib_paper.obj \
+	$(OBJS)\corelib_panelcmn.obj \
 	$(OBJS)\corelib_persist.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
 	$(OBJS)\corelib_prntbase.obj \
 	$(OBJS)\corelib_quantize.obj \
+	$(OBJS)\corelib_radiobtncmn.obj \
 	$(OBJS)\corelib_radiocmn.obj \
 	$(OBJS)\corelib_rearrangectrl.obj \
 	$(OBJS)\corelib_rendcmn.obj \
 	$(OBJS)\corelib_rgncmn.obj \
+	$(OBJS)\corelib_scrolbarcmn.obj \
 	$(OBJS)\corelib_settcmn.obj \
 	$(OBJS)\corelib_sizer.obj \
+	$(OBJS)\corelib_slidercmn.obj \
+	$(OBJS)\corelib_spinbtncmn.obj \
 	$(OBJS)\corelib_spinctrlcmn.obj \
 	$(OBJS)\corelib_srchcmn.obj \
 	$(OBJS)\corelib_statbar.obj \
+	$(OBJS)\corelib_statbmpcmn.obj \
+	$(OBJS)\corelib_statboxcmn.obj \
+	$(OBJS)\corelib_statlinecmn.obj \
 	$(OBJS)\corelib_stattextcmn.obj \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
@@ -3714,6 +3867,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valgen.obj \
 	$(OBJS)\corelib_validate.obj \
 	$(OBJS)\corelib_valtext.obj \
+	$(OBJS)\corelib_valnum.obj \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_windowid.obj \
 	$(OBJS)\corelib_wrapsizer.obj \
@@ -3731,6 +3885,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
+	$(OBJS)\corelib_markuptext.obj \
 	$(OBJS)\corelib_msgdlgg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_panelg.obj \
@@ -3797,6 +3952,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_settings.obj \
 	$(OBJS)\corelib_tooltip.obj \
 	$(OBJS)\corelib_toplevel.obj \
+	$(OBJS)\corelib_uiaction.obj \
 	$(OBJS)\corelib_utilsgui.obj \
 	$(OBJS)\corelib_uxtheme.obj \
 	$(OBJS)\corelib_window.obj \
@@ -3860,17 +4016,23 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_accelcmn.obj \
 	$(OBJS)\corelib_accesscmn.obj \
 	$(OBJS)\corelib_anidecod.obj \
+	$(OBJS)\corelib_affinematrix2d.obj \
 	$(OBJS)\corelib_appcmn.obj \
 	$(OBJS)\corelib_artprov.obj \
 	$(OBJS)\corelib_artstd.obj \
+	$(OBJS)\corelib_arttango.obj \
 	$(OBJS)\corelib_bmpbase.obj \
+	$(OBJS)\corelib_bmpbtncmn.obj \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_btncmn.obj \
 	$(OBJS)\corelib_cairo.obj \
+	$(OBJS)\corelib_checkboxcmn.obj \
+	$(OBJS)\corelib_checklstcmn.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
 	$(OBJS)\corelib_clrpickercmn.obj \
 	$(OBJS)\corelib_colourcmn.obj \
+	$(OBJS)\corelib_colourdata.obj \
 	$(OBJS)\corelib_combocmn.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
@@ -3878,11 +4040,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cshelp.obj \
 	$(OBJS)\corelib_ctrlcmn.obj \
 	$(OBJS)\corelib_ctrlsub.obj \
-	$(OBJS)\corelib_datacmn.obj \
 	$(OBJS)\corelib_dcbase.obj \
 	$(OBJS)\corelib_dcbufcmn.obj \
 	$(OBJS)\corelib_dcgraph.obj \
 	$(OBJS)\corelib_dcsvg.obj \
+	$(OBJS)\corelib_dirctrlcmn.obj \
 	$(OBJS)\corelib_dlgcmn.obj \
 	$(OBJS)\corelib_dndcmn.obj \
 	$(OBJS)\corelib_dobjcmn.obj \
@@ -3898,6 +4060,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontpickercmn.obj \
 	$(OBJS)\corelib_fldlgcmn.obj \
 	$(OBJS)\corelib_fontcmn.obj \
+	$(OBJS)\corelib_fontdata.obj \
 	$(OBJS)\corelib_graphicc.obj \
 	$(OBJS)\corelib_fontenumcmn.obj \
 	$(OBJS)\corelib_fontmap.obj \
@@ -3929,6 +4092,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_layout.obj \
 	$(OBJS)\corelib_lboxcmn.obj \
 	$(OBJS)\corelib_listctrlcmn.obj \
+	$(OBJS)\corelib_markupparser.obj \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
 	$(OBJS)\corelib_mousemanager.obj \
@@ -3936,20 +4100,28 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_overlaycmn.obj \
 	$(OBJS)\corelib_ownerdrwcmn.obj \
 	$(OBJS)\corelib_paper.obj \
+	$(OBJS)\corelib_panelcmn.obj \
 	$(OBJS)\corelib_persist.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
 	$(OBJS)\corelib_prntbase.obj \
 	$(OBJS)\corelib_quantize.obj \
+	$(OBJS)\corelib_radiobtncmn.obj \
 	$(OBJS)\corelib_radiocmn.obj \
 	$(OBJS)\corelib_rearrangectrl.obj \
 	$(OBJS)\corelib_rendcmn.obj \
 	$(OBJS)\corelib_rgncmn.obj \
+	$(OBJS)\corelib_scrolbarcmn.obj \
 	$(OBJS)\corelib_settcmn.obj \
 	$(OBJS)\corelib_sizer.obj \
+	$(OBJS)\corelib_slidercmn.obj \
+	$(OBJS)\corelib_spinbtncmn.obj \
 	$(OBJS)\corelib_spinctrlcmn.obj \
 	$(OBJS)\corelib_srchcmn.obj \
 	$(OBJS)\corelib_statbar.obj \
+	$(OBJS)\corelib_statbmpcmn.obj \
+	$(OBJS)\corelib_statboxcmn.obj \
+	$(OBJS)\corelib_statlinecmn.obj \
 	$(OBJS)\corelib_stattextcmn.obj \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
@@ -3961,6 +4133,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_valgen.obj \
 	$(OBJS)\corelib_validate.obj \
 	$(OBJS)\corelib_valtext.obj \
+	$(OBJS)\corelib_valnum.obj \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_windowid.obj \
 	$(OBJS)\corelib_wrapsizer.obj \
@@ -3978,6 +4151,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
+	$(OBJS)\corelib_markuptext.obj \
 	$(OBJS)\corelib_msgdlgg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_panelg.obj \
@@ -4016,7 +4190,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_bmpcboxcmn.obj \
 	$(OBJS)\advdll_calctrlcmn.obj \
 	$(OBJS)\advdll_datavcmn.obj \
+	$(OBJS)\advdll_gridcmn.obj \
 	$(OBJS)\advdll_hyperlnkcmn.obj \
+	$(OBJS)\advdll_odcombocmn.obj \
 	$(OBJS)\advdll_aboutdlgg.obj \
 	$(OBJS)\advdll_bmpcboxg.obj \
 	$(OBJS)\advdll_calctrlg.obj \
@@ -4040,8 +4216,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_wizard.obj \
 	$(OBJS)\advdll_taskbarcmn.obj \
 	$(OBJS)\advdll_aboutdlg.obj \
-	$(OBJS)\advdll_commandlinkbutton.obj \
-	$(OBJS)\advdll_hyperlink.obj \
 	$(OBJS)\advdll_notifmsg.obj \
 	$(OBJS)\advdll_sound.obj \
 	$(OBJS)\advdll_taskbar.obj \
@@ -4049,8 +4223,10 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_animateg.obj \
 	$(OBJS)\advdll_bmpcbox.obj \
 	$(OBJS)\advdll_calctrl.obj \
+	$(OBJS)\advdll_commandlinkbutton.obj \
 	$(OBJS)\advdll_datecontrols.obj \
-	$(OBJS)\advdll_datectrl.obj
+	$(OBJS)\advdll_datectrl.obj \
+	$(OBJS)\advdll_hyperlink.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4058,7 +4234,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_bmpcboxcmn.obj \
 	$(OBJS)\advdll_calctrlcmn.obj \
 	$(OBJS)\advdll_datavcmn.obj \
+	$(OBJS)\advdll_gridcmn.obj \
 	$(OBJS)\advdll_hyperlnkcmn.obj \
+	$(OBJS)\advdll_odcombocmn.obj \
 	$(OBJS)\advdll_aboutdlgg.obj \
 	$(OBJS)\advdll_bmpcboxg.obj \
 	$(OBJS)\advdll_calctrlg.obj \
@@ -4082,8 +4260,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_wizard.obj \
 	$(OBJS)\advdll_taskbarcmn.obj \
 	$(OBJS)\advdll_aboutdlg.obj \
-	$(OBJS)\advdll_commandlinkbutton.obj \
-	$(OBJS)\advdll_hyperlink.obj \
 	$(OBJS)\advdll_notifmsg.obj \
 	$(OBJS)\advdll_sound.obj \
 	$(OBJS)\advdll_taskbar.obj \
@@ -4100,7 +4276,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_bmpcboxcmn.obj \
 	$(OBJS)\advlib_calctrlcmn.obj \
 	$(OBJS)\advlib_datavcmn.obj \
+	$(OBJS)\advlib_gridcmn.obj \
 	$(OBJS)\advlib_hyperlnkcmn.obj \
+	$(OBJS)\advlib_odcombocmn.obj \
 	$(OBJS)\advlib_aboutdlgg.obj \
 	$(OBJS)\advlib_bmpcboxg.obj \
 	$(OBJS)\advlib_calctrlg.obj \
@@ -4124,8 +4302,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_wizard.obj \
 	$(OBJS)\advlib_taskbarcmn.obj \
 	$(OBJS)\advlib_aboutdlg.obj \
-	$(OBJS)\advlib_commandlinkbutton.obj \
-	$(OBJS)\advlib_hyperlink.obj \
 	$(OBJS)\advlib_notifmsg.obj \
 	$(OBJS)\advlib_sound.obj \
 	$(OBJS)\advlib_taskbar.obj \
@@ -4133,8 +4309,10 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_animateg.obj \
 	$(OBJS)\advlib_bmpcbox.obj \
 	$(OBJS)\advlib_calctrl.obj \
+	$(OBJS)\advlib_commandlinkbutton.obj \
 	$(OBJS)\advlib_datecontrols.obj \
-	$(OBJS)\advlib_datectrl.obj
+	$(OBJS)\advlib_datectrl.obj \
+	$(OBJS)\advlib_hyperlink.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4142,7 +4320,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_bmpcboxcmn.obj \
 	$(OBJS)\advlib_calctrlcmn.obj \
 	$(OBJS)\advlib_datavcmn.obj \
+	$(OBJS)\advlib_gridcmn.obj \
 	$(OBJS)\advlib_hyperlnkcmn.obj \
+	$(OBJS)\advlib_odcombocmn.obj \
 	$(OBJS)\advlib_aboutdlgg.obj \
 	$(OBJS)\advlib_bmpcboxg.obj \
 	$(OBJS)\advlib_calctrlg.obj \
@@ -4166,8 +4346,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_wizard.obj \
 	$(OBJS)\advlib_taskbarcmn.obj \
 	$(OBJS)\advlib_aboutdlg.obj \
-	$(OBJS)\advlib_commandlinkbutton.obj \
-	$(OBJS)\advlib_hyperlink.obj \
 	$(OBJS)\advlib_notifmsg.obj \
 	$(OBJS)\advlib_sound.obj \
 	$(OBJS)\advlib_taskbar.obj \
@@ -4372,7 +4550,7 @@ __RUNTIME_LIBS_5 =
 __WXUNIV_DEFINE_p_63 = -d__WXUNIVERSAL__
 !endif
 !if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_61 = -dwxDEBUG_LEVEL=0
+__DEBUG_DEFINE_p_62 = -dwxDEBUG_LEVEL=0
 !endif
 !if "$(BUILD)" == "release"
 __NDEBUG_DEFINE_p_61 = -dNDEBUG
@@ -5034,7 +5212,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -5116,9 +5294,6 @@ $(OBJS)\wxpng_png.obj: ..\..\src\png\png.c
 $(OBJS)\wxpng_pngerror.obj: ..\..\src\png\pngerror.c
 	$(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngerror.c
 
-$(OBJS)\wxpng_pnggccrd.obj: ..\..\src\png\pnggccrd.c
-	$(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pnggccrd.c
-
 $(OBJS)\wxpng_pngget.obj: ..\..\src\png\pngget.c
 	$(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngget.c
 
@@ -5146,9 +5321,6 @@ $(OBJS)\wxpng_pngset.obj: ..\..\src\png\pngset.c
 $(OBJS)\wxpng_pngtrans.obj: ..\..\src\png\pngtrans.c
 	$(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngtrans.c
 
-$(OBJS)\wxpng_pngvcrd.obj: ..\..\src\png\pngvcrd.c
-	$(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngvcrd.c
-
 $(OBJS)\wxpng_pngwio.obj: ..\..\src\png\pngwio.c
 	$(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwio.c
 
@@ -5872,6 +6044,9 @@ $(OBJS)\monodll_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mstream.cpp
 
+$(OBJS)\monodll_numformatter.obj: ..\..\src\common\numformatter.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\numformatter.cpp
+
 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\object.cpp
 
@@ -6106,6 +6281,9 @@ $(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp
 
+$(OBJS)\monodll_anybutton.obj: ..\..\src\msw\anybutton.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
+
 $(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -6193,6 +6371,9 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
+$(OBJS)\monodll_msw_panel.obj: ..\..\src\msw\panel.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp
+
 $(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp
 
@@ -6247,9 +6428,6 @@ $(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
-$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
-
 $(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
 
@@ -6409,12 +6587,18 @@ $(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
 $(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
 
+$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
 $(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
 
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
 $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
@@ -6544,6 +6728,9 @@ $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
 
+$(OBJS)\monodll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp
+
 $(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
 
@@ -6673,6 +6860,9 @@ $(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
 
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -6760,38 +6950,41 @@ $(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
 $(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
 
-$(OBJS)\monodll_panel.obj: ..\..\src\ribbon\panel.cpp
+$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
 
 $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
 
-$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
-
 $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
 
-$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
-$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
 
-$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp
 
-$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
 
-$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+
+$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+
+$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -7018,6 +7211,11 @@ $(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
@@ -7093,6 +7291,11 @@ $(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -7108,11 +7311,21 @@ $(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_arttango.obj: ..\..\src\common\arttango.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arttango.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
@@ -7128,6 +7341,16 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
@@ -7148,6 +7371,11 @@ $(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -7183,11 +7411,6 @@ $(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -7208,6 +7431,11 @@ $(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
@@ -7283,6 +7511,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_graphicc.obj: ..\..\src\generic\graphicc.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp
@@ -7438,6 +7671,11 @@ $(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp
@@ -7473,6 +7711,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
@@ -7498,6 +7741,11 @@ $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
@@ -7518,6 +7766,11 @@ $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp
@@ -7528,6 +7781,16 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
@@ -7543,6 +7806,21 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
@@ -7598,6 +7876,11 @@ $(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_valnum.obj: ..\..\src\common\valnum.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp
@@ -7683,6 +7966,11 @@ $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
@@ -7808,11 +8096,21 @@ $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
@@ -7928,16 +8226,6 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
@@ -7964,7 +8252,7 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
 !endif
 
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL ..\..\src\msw\version.rc
 
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -8107,6 +8395,9 @@ $(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp
 
+$(OBJS)\monolib_numformatter.obj: ..\..\src\common\numformatter.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\numformatter.cpp
+
 $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp
 
@@ -8341,6 +8632,9 @@ $(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp
 
+$(OBJS)\monolib_anybutton.obj: ..\..\src\msw\anybutton.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
+
 $(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -8428,6 +8722,9 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
+$(OBJS)\monolib_msw_panel.obj: ..\..\src\msw\panel.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp
+
 $(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp
 
@@ -8482,9 +8779,6 @@ $(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
-$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
-
 $(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
 
@@ -8644,12 +8938,18 @@ $(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
 $(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
 
+$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
 $(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
 
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
 $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
 
@@ -8779,6 +9079,9 @@ $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
 
+$(OBJS)\monolib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp
+
 $(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
 
@@ -8908,6 +9211,9 @@ $(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
 
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -8995,38 +9301,41 @@ $(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
 $(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
 
-$(OBJS)\monolib_panel.obj: ..\..\src\ribbon\panel.cpp
+$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
 
 $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
 
-$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
-
 $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
 
-$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
-$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
 
-$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp
 
-$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
 
-$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+
+$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+
+$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -9253,6 +9562,11 @@ $(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
@@ -9328,6 +9642,11 @@ $(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -9343,11 +9662,21 @@ $(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_arttango.obj: ..\..\src\common\arttango.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arttango.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
@@ -9363,6 +9692,16 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
@@ -9383,6 +9722,11 @@ $(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -9418,11 +9762,6 @@ $(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -9444,7 +9783,12 @@ $(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
+$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
 !endif
 
@@ -9518,6 +9862,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp
@@ -9673,6 +10022,11 @@ $(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp
@@ -9708,6 +10062,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp
@@ -9733,6 +10092,11 @@ $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
@@ -9753,6 +10117,11 @@ $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp
@@ -9763,6 +10132,16 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
@@ -9778,6 +10157,21 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
@@ -9833,6 +10227,11 @@ $(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_valnum.obj: ..\..\src\common\valnum.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp
@@ -9918,6 +10317,11 @@ $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
@@ -10043,11 +10447,21 @@ $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
@@ -10163,16 +10577,6 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
@@ -10202,7 +10606,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 ..\..\src\msw\version.rc
 
 $(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp
@@ -10342,6 +10746,9 @@ $(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp
 
+$(OBJS)\basedll_numformatter.obj: ..\..\src\common\numformatter.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\numformatter.cpp
+
 $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp
 
@@ -10675,6 +11082,9 @@ $(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp
 $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp
 
+$(OBJS)\baselib_numformatter.obj: ..\..\src\common\numformatter.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\numformatter.cpp
+
 $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp
 
@@ -10871,7 +11281,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET ..\..\src\msw\version.rc
 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
 	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
@@ -10952,7 +11362,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 ..\..\src\msw\version.rc
 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
@@ -10984,6 +11394,9 @@ $(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp
 
+$(OBJS)\coredll_anybutton.obj: ..\..\src\msw\anybutton.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
+
 $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -11071,6 +11484,9 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
+$(OBJS)\coredll_panel.obj: ..\..\src\msw\panel.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp
+
 $(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp
 
@@ -11125,9 +11541,6 @@ $(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
-$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
-
 $(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
 
@@ -11491,6 +11904,11 @@ $(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
@@ -11566,6 +11984,11 @@ $(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -11581,11 +12004,21 @@ $(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_arttango.obj: ..\..\src\common\arttango.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\arttango.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
@@ -11601,6 +12034,16 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
@@ -11621,6 +12064,11 @@ $(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -11656,11 +12104,6 @@ $(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -11681,6 +12124,11 @@ $(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
@@ -11756,6 +12204,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp
@@ -11911,6 +12364,11 @@ $(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp
@@ -11946,6 +12404,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
@@ -11971,6 +12434,11 @@ $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
@@ -11991,6 +12459,11 @@ $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp
@@ -12001,6 +12474,16 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
@@ -12016,6 +12499,21 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
@@ -12071,6 +12569,11 @@ $(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_valnum.obj: ..\..\src\common\valnum.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp
@@ -12156,6 +12659,11 @@ $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
@@ -12294,6 +12802,9 @@ $(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
 $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp
 
+$(OBJS)\corelib_anybutton.obj: ..\..\src\msw\anybutton.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
+
 $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
 
@@ -12381,6 +12892,9 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
+$(OBJS)\corelib_panel.obj: ..\..\src\msw\panel.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp
+
 $(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp
 
@@ -12435,9 +12949,6 @@ $(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
 
-$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
-
 $(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
 
@@ -12801,6 +13312,11 @@ $(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
@@ -12876,6 +13392,11 @@ $(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
@@ -12891,11 +13412,21 @@ $(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_arttango.obj: ..\..\src\common\arttango.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\arttango.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
@@ -12911,6 +13442,16 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
@@ -12931,6 +13472,11 @@ $(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
@@ -12966,11 +13512,6 @@ $(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_datacmn.obj: ..\..\src\common\datacmn.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp
@@ -12991,6 +13532,11 @@ $(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp
@@ -13066,6 +13612,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp
@@ -13221,6 +13772,11 @@ $(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp
@@ -13256,6 +13812,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
@@ -13281,6 +13842,11 @@ $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
@@ -13301,6 +13867,11 @@ $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp
@@ -13311,6 +13882,16 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
@@ -13326,6 +13907,21 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp
@@ -13381,6 +13977,11 @@ $(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_valnum.obj: ..\..\src\common\valnum.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valnum.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp
@@ -13466,6 +14067,11 @@ $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
@@ -13575,7 +14181,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV ..\..\src\msw\version.rc
 
 $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
@@ -13583,12 +14189,18 @@ $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
 $(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
 
+$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
 $(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
 
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
@@ -13601,9 +14213,15 @@ $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
 
+$(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+
 $(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 
+$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
 $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
 
@@ -13673,12 +14291,6 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 
-$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-
-$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
 $(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
 
@@ -13703,12 +14315,18 @@ $(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
 $(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
 
+$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
 $(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
 
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
@@ -13721,9 +14339,15 @@ $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
 
+$(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp
+
 $(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 
+$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
 $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
 
@@ -13793,12 +14417,6 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 
-$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-
-$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
 $(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
 
@@ -13818,7 +14436,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
@@ -13851,7 +14469,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML ..\..\src\msw\version.rc
 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
 	$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -14016,7 +14634,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA ..\..\src\msw\version.rc
 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 	$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
@@ -14037,7 +14655,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML ..\..\src\msw\version.rc
 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp
@@ -14058,7 +14676,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC ..\..\src\msw\version.rc
 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
@@ -14093,6 +14711,9 @@ $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
 
+$(OBJS)\xrcdll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp
+
 $(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
 
@@ -14222,6 +14843,9 @@ $(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
 
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -14279,6 +14903,9 @@ $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp
 
+$(OBJS)\xrclib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp
+
 $(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp
 
@@ -14408,6 +15035,9 @@ $(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
 $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
 
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -14433,7 +15063,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI ..\..\src\msw\version.rc
 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
 	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
@@ -14478,7 +15108,7 @@ $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
 
 $(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
 	$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
@@ -14547,7 +15177,7 @@ $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
 
 $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
 	$(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@@ -14604,70 +15234,76 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
-
-$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
 
 $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
 
-$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
-$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
 
-$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+$(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp
 
-$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
 
-$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+
+$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+
+$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
-$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
-
 $(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
 
-$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
-$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
+$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
 
 $(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp
 
-$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp
+$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp
 
-$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
 
 $(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp
 
-$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
-	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp
+$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp
+
+$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp
+
+$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
 
 $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC ..\..\src\msw\version.rc
 
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
 	$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -14694,7 +15330,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL ..\..\src\msw\version.rc
 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
 	$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp