rebaked after adding renderer.h/.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 42cd49a4c3d5532a51e0713fb3c0584d0250901a..ad6584feddde46515beb7d1a4cac1e3d50b043b7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)

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


@@ -126,46 +126,46 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_0@      wx/bmpbuttn.h wx/checkbox.h wx/checklst.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/choice.h wx/scrolbar.h wx/stattext.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/statbmp.h wx/statbox.h wx/listbox.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/bmpbuttn.h wx/checkbox.h wx/checklst.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/choice.h wx/scrolbar.h wx/stattext.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/statbmp.h wx/statbox.h wx/listbox.h \

-@COND_USE_GUI_1_WXUNIV_0@      wx/radiobox.h wx/radiobut.h wx/textctrl.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/slider.h wx/gauge.h wx/scrolwin.h wx/dirdlg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/toolbar.h wx/combobox.h wx/layout.h wx/sizer.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/mdi.h wx/statusbr.h wx/scrolbar.h wx/choicdlg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/textdlg.h wx/filedlg.h wx/validate.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/valtext.h wx/selstore.h wx/generic/accel.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/calctrl.h wx/generic/choicdgg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/colrdlgg.h wx/generic/dcpsg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/dirctrlg.h wx/generic/fontdlgg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/filedlgg.h wx/generic/grid.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/gridctrl.h wx/generic/grid.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/helpext.h wx/generic/logg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/helphtml.h wx/generic/imaglist.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/laywin.h wx/generic/msgdlgg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/notebook.h wx/generic/panelg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/prntdlgg.h wx/generic/progdlgg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/sashwin.h wx/generic/scrolwin.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/spinctlg.h wx/generic/splash.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/splitter.h wx/generic/textdlgg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/timer.h wx/generic/wizard.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/generic/treectlg.h wx/accel.h wx/access.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/afterstd.h wx/artprov.h wx/bitmap.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/busyinfo.h wx/calctrl.h wx/caret.h wx/clipbrd.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/cmdproc.h wx/colordlg.h wx/colour.h wx/cshelp.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/dataobj.h wx/dbgrid.h wx/dcbuffer.h wx/dcps.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/dialup.h wx/dirctrl.h wx/display.h wx/dnd.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/docmdi.h wx/docview.h wx/dragimag.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/effects.h wx/evtloop.h wx/fdrepdlg.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/fmappriv.h wx/font.h wx/fontdlg.h wx/fontenum.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/fontutil.h wx/gdiobj.h wx/geometry.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/gifdecod.h wx/glcanvas.h wx/grid.h wx/help.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/helpbase.h wx/helpwin.h wx/iconbndl.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/imagbmp.h wx/image.h wx/imaggif.h wx/imagiff.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/imagjpeg.h wx/imaglist.h wx/imagpcx.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/imagpng.h wx/imagpnm.h wx/imagtiff.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/imagxpm.h wx/joystick.h wx/laywin.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/listbase.h wx/listctrl.h wx/matrix.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/menuitem.h wx/metafile.h wx/minifram.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/notebook.h wx/ownerdrw.h wx/paper.h \
-@COND_USE_GUI_1_WXUNIV_0@      wx/popupwin.h wx/print.h wx/printdlg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/radiobox.h wx/radiobut.h wx/renderer.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/textctrl.h wx/slider.h wx/gauge.h wx/scrolwin.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/dirdlg.h wx/toolbar.h wx/combobox.h wx/layout.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/sizer.h wx/mdi.h wx/statusbr.h wx/scrolbar.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/choicdlg.h wx/textdlg.h wx/filedlg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/validate.h wx/valtext.h wx/selstore.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/accel.h wx/generic/calctrl.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/choicdgg.h wx/generic/colrdlgg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/dcpsg.h wx/generic/dirctrlg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/fontdlgg.h wx/generic/filedlgg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/grid.h wx/generic/gridctrl.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/grid.h wx/generic/helpext.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/logg.h wx/helphtml.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/imaglist.h wx/generic/laywin.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/msgdlgg.h wx/generic/notebook.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/panelg.h wx/generic/prntdlgg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/progdlgg.h wx/generic/sashwin.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/scrolwin.h wx/generic/spinctlg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/splash.h wx/generic/splitter.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/textdlgg.h wx/generic/timer.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/generic/wizard.h wx/generic/treectlg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/accel.h wx/access.h wx/afterstd.h wx/artprov.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/bitmap.h wx/busyinfo.h wx/calctrl.h wx/caret.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/clipbrd.h wx/cmdproc.h wx/colordlg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/colour.h wx/cshelp.h wx/dataobj.h wx/dbgrid.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/dcbuffer.h wx/dcps.h wx/dialup.h wx/dirctrl.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/display.h wx/dnd.h wx/docmdi.h wx/docview.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/dragimag.h wx/effects.h wx/evtloop.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/fdrepdlg.h wx/fmappriv.h wx/font.h wx/fontdlg.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/fontenum.h wx/fontutil.h wx/gdiobj.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/geometry.h wx/gifdecod.h wx/glcanvas.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/grid.h wx/help.h wx/helpbase.h wx/helpwin.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/iconbndl.h wx/imagbmp.h wx/image.h wx/imaggif.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/imagiff.h wx/imagjpeg.h wx/imaglist.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/imagpcx.h wx/imagpng.h wx/imagpnm.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/imagtiff.h wx/imagxpm.h wx/joystick.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/laywin.h wx/listbase.h wx/listctrl.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/matrix.h wx/menuitem.h wx/metafile.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/minifram.h wx/notebook.h wx/ownerdrw.h \
+@COND_USE_GUI_1_WXUNIV_0@      wx/paper.h wx/popupwin.h wx/print.h wx/printdlg.h \

 @COND_USE_GUI_1_WXUNIV_0@      wx/prntbase.h wx/progdlg.h wx/ptr_scpd.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/quantize.h wx/rawbmp.h wx/region.h wx/sashwin.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/scopeguard.h wx/spinbutt.h wx/spinctrl.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/prntbase.h wx/progdlg.h wx/ptr_scpd.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/quantize.h wx/rawbmp.h wx/region.h wx/sashwin.h \
 @COND_USE_GUI_1_WXUNIV_0@      wx/scopeguard.h wx/spinbutt.h wx/spinctrl.h \


@@ -187,46 +187,46 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@      wx/bmpbuttn.h wx/checkbox.h wx/checklst.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/choice.h wx/scrolbar.h wx/stattext.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/statbmp.h wx/statbox.h wx/listbox.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/bmpbuttn.h wx/checkbox.h wx/checklst.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/choice.h wx/scrolbar.h wx/stattext.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/statbmp.h wx/statbox.h wx/listbox.h \

-@COND_USE_GUI_1_WXUNIV_1@      wx/radiobox.h wx/radiobut.h wx/textctrl.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/slider.h wx/gauge.h wx/scrolwin.h wx/dirdlg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/toolbar.h wx/combobox.h wx/layout.h wx/sizer.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/mdi.h wx/statusbr.h wx/scrolbar.h wx/choicdlg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/textdlg.h wx/filedlg.h wx/validate.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/valtext.h wx/selstore.h wx/generic/accel.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/calctrl.h wx/generic/choicdgg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/colrdlgg.h wx/generic/dcpsg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/dirctrlg.h wx/generic/fontdlgg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/filedlgg.h wx/generic/grid.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/gridctrl.h wx/generic/grid.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/helpext.h wx/generic/logg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/helphtml.h wx/generic/imaglist.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/laywin.h wx/generic/msgdlgg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/notebook.h wx/generic/panelg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/prntdlgg.h wx/generic/progdlgg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/sashwin.h wx/generic/scrolwin.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/spinctlg.h wx/generic/splash.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/splitter.h wx/generic/textdlgg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/timer.h wx/generic/wizard.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/generic/treectlg.h wx/accel.h wx/access.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/afterstd.h wx/artprov.h wx/bitmap.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/busyinfo.h wx/calctrl.h wx/caret.h wx/clipbrd.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/cmdproc.h wx/colordlg.h wx/colour.h wx/cshelp.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/dataobj.h wx/dbgrid.h wx/dcbuffer.h wx/dcps.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/dialup.h wx/dirctrl.h wx/display.h wx/dnd.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/docmdi.h wx/docview.h wx/dragimag.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/effects.h wx/evtloop.h wx/fdrepdlg.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/fmappriv.h wx/font.h wx/fontdlg.h wx/fontenum.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/fontutil.h wx/gdiobj.h wx/geometry.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/gifdecod.h wx/glcanvas.h wx/grid.h wx/help.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/helpbase.h wx/helpwin.h wx/iconbndl.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/imagbmp.h wx/image.h wx/imaggif.h wx/imagiff.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/imagjpeg.h wx/imaglist.h wx/imagpcx.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/imagpng.h wx/imagpnm.h wx/imagtiff.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/imagxpm.h wx/joystick.h wx/laywin.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/listbase.h wx/listctrl.h wx/matrix.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/menuitem.h wx/metafile.h wx/minifram.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/notebook.h wx/ownerdrw.h wx/paper.h \
-@COND_USE_GUI_1_WXUNIV_1@      wx/popupwin.h wx/print.h wx/printdlg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/radiobox.h wx/radiobut.h wx/renderer.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/textctrl.h wx/slider.h wx/gauge.h wx/scrolwin.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/dirdlg.h wx/toolbar.h wx/combobox.h wx/layout.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/sizer.h wx/mdi.h wx/statusbr.h wx/scrolbar.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/choicdlg.h wx/textdlg.h wx/filedlg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/validate.h wx/valtext.h wx/selstore.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/accel.h wx/generic/calctrl.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/choicdgg.h wx/generic/colrdlgg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/dcpsg.h wx/generic/dirctrlg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/fontdlgg.h wx/generic/filedlgg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/grid.h wx/generic/gridctrl.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/grid.h wx/generic/helpext.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/logg.h wx/helphtml.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/imaglist.h wx/generic/laywin.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/msgdlgg.h wx/generic/notebook.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/panelg.h wx/generic/prntdlgg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/progdlgg.h wx/generic/sashwin.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/scrolwin.h wx/generic/spinctlg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/splash.h wx/generic/splitter.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/textdlgg.h wx/generic/timer.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/generic/wizard.h wx/generic/treectlg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/accel.h wx/access.h wx/afterstd.h wx/artprov.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/bitmap.h wx/busyinfo.h wx/calctrl.h wx/caret.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/clipbrd.h wx/cmdproc.h wx/colordlg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/colour.h wx/cshelp.h wx/dataobj.h wx/dbgrid.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/dcbuffer.h wx/dcps.h wx/dialup.h wx/dirctrl.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/display.h wx/dnd.h wx/docmdi.h wx/docview.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/dragimag.h wx/effects.h wx/evtloop.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/fdrepdlg.h wx/fmappriv.h wx/font.h wx/fontdlg.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/fontenum.h wx/fontutil.h wx/gdiobj.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/geometry.h wx/gifdecod.h wx/glcanvas.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/grid.h wx/help.h wx/helpbase.h wx/helpwin.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/iconbndl.h wx/imagbmp.h wx/image.h wx/imaggif.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/imagiff.h wx/imagjpeg.h wx/imaglist.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/imagpcx.h wx/imagpng.h wx/imagpnm.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/imagtiff.h wx/imagxpm.h wx/joystick.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/laywin.h wx/listbase.h wx/listctrl.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/matrix.h wx/menuitem.h wx/metafile.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/minifram.h wx/notebook.h wx/ownerdrw.h \
+@COND_USE_GUI_1_WXUNIV_1@      wx/paper.h wx/popupwin.h wx/print.h wx/printdlg.h \

 @COND_USE_GUI_1_WXUNIV_1@      wx/prntbase.h wx/progdlg.h wx/ptr_scpd.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/quantize.h wx/rawbmp.h wx/region.h wx/sashwin.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/scopeguard.h wx/spinbutt.h wx/spinctrl.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/prntbase.h wx/progdlg.h wx/ptr_scpd.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/quantize.h wx/rawbmp.h wx/region.h wx/sashwin.h \
 @COND_USE_GUI_1_WXUNIV_1@      wx/scopeguard.h wx/spinbutt.h wx/spinctrl.h \


@@ -629,56 +629,56 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_PLATFORM_WIN32_1@        baselib_crashrpt.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) \
 @COND_PLATFORM_WIN32_1@        baselib_crashrpt.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) \

-@COND_USE_GUI_1_WXUNIV_0@      monodll_selstore.o monodll_busyinfo.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_calctrl.o monodll_choicdgg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_dcbuffer.o monodll_dcpsg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_dirctrlg.o monodll_dragimgg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_grid.o monodll_gridctrl.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_gridsel.o monodll_laywin.o monodll_logg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_numdlgg.o monodll_panelg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_progdlgg.o monodll_sashwin.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_scrlwing.o monodll_spinctlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_splash.o monodll_splitter.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_tbarsmpl.o monodll_textdlgg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_tipdlg.o monodll_tipwin.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_treectlg.o monodll_vlbox.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_vscroll.o monodll_wizard.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_appcmn.o monodll_fontmap.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_accesscmn.o monodll_artprov.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_artstd.o monodll_bmpbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_choiccmn.o monodll_clipcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_cmdproc.o monodll_cmndata.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_containr.o monodll_cshelp.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_ctrlcmn.o monodll_ctrlsub.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_datacmn.o monodll_dbgrid.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_dcbase.o monodll_dlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_dndcmn.o monodll_dobjcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_docmdi.o monodll_docview.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_dpycmn.o monodll_dseldlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_effects.o monodll_fddlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_fldlgcmn.o monodll_fontcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_framecmn.o monodll_timercmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_toplvcmn.o monodll_gaugecmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_gdicmn.o monodll_geometry.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_gifdecod.o monodll_helpbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_iconbndl.o monodll_imagall.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_imagbmp.o monodll_image.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_imaggif.o monodll_imagiff.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_imagjpeg.o monodll_imagpcx.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_imagpng.o monodll_imagpnm.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_imagtiff.o monodll_imagxpm.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_imagfill.o monodll_layout.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_lboxcmn.o monodll_matrix.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_menucmn.o monodll_nbkbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_paper.o monodll_popupcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_prntbase.o monodll_quantize.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_radiocmn.o monodll_rgncmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_settcmn.o monodll_sizer.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_statbar.o monodll_tbarbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_textcmn.o monodll_treebase.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_valgen.o monodll_validate.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_valtext.o monodll_wincmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monodll_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@      monodll_busyinfo.o monodll_calctrl.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_choicdgg.o monodll_dcbuffer.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_dcpsg.o monodll_dirctrlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_dragimgg.o monodll_grid.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_gridctrl.o monodll_gridsel.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_laywin.o monodll_logg.o monodll_numdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_panelg.o monodll_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_renderg.o monodll_sashwin.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_scrlwing.o monodll_selstore.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_spinctlg.o monodll_splash.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_splitter.o monodll_tbarsmpl.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_textdlgg.o monodll_tipdlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_tipwin.o monodll_treectlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_vlbox.o monodll_vscroll.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_wizard.o monodll_appcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_fontmap.o monodll_accesscmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_artprov.o monodll_artstd.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_bmpbase.o monodll_choiccmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_clipcmn.o monodll_cmdproc.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_cmndata.o monodll_containr.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_cshelp.o monodll_ctrlcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_ctrlsub.o monodll_datacmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_dbgrid.o monodll_dcbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_dlgcmn.o monodll_dndcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_dobjcmn.o monodll_docmdi.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_docview.o monodll_dpycmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_dseldlg.o monodll_effects.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_fddlgcmn.o monodll_fldlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_fontcmn.o monodll_framecmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_timercmn.o monodll_toplvcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_gaugecmn.o monodll_gdicmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_geometry.o monodll_gifdecod.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_helpbase.o monodll_iconbndl.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_imagall.o monodll_imagbmp.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_image.o monodll_imaggif.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_imagiff.o monodll_imagjpeg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_imagpcx.o monodll_imagpng.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_imagpnm.o monodll_imagtiff.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_imagxpm.o monodll_imagfill.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_layout.o monodll_lboxcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_matrix.o monodll_menucmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_nbkbase.o monodll_paper.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_popupcmn.o monodll_prntbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_quantize.o monodll_radiocmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_rgncmn.o monodll_settcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_sizer.o monodll_statbar.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_tbarbase.o monodll_textcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_treebase.o monodll_valgen.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_validate.o monodll_valtext.o \
+@COND_USE_GUI_1_WXUNIV_0@      monodll_wincmn.o monodll_xpmdecod.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o \


@@ -704,108 +704,110 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@      monodll_accel.o monodll_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monodll_fdrepdlg.o monodll_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monodll_tabg.o monodll_gtk.o monodll_win32.o \
 @COND_USE_GUI_1_WXUNIV_1@      monodll_accel.o monodll_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monodll_fdrepdlg.o monodll_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monodll_tabg.o monodll_gtk.o monodll_win32.o \

-@COND_USE_GUI_1_WXUNIV_1@      monodll_metal.o monodll_selstore.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_busyinfo.o monodll_calctrl.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_choicdgg.o monodll_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_dcpsg.o monodll_dirctrlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_dragimgg.o monodll_grid.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_gridctrl.o monodll_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_laywin.o monodll_logg.o monodll_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_panelg.o monodll_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_metal.o monodll_busyinfo.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_calctrl.o monodll_choicdgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_dcbuffer.o monodll_dcpsg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_dirctrlg.o monodll_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_grid.o monodll_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_gridsel.o monodll_laywin.o monodll_logg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_numdlgg.o monodll_panelg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_progdlgg.o monodll_renderg.o \

 @COND_USE_GUI_1_WXUNIV_1@      monodll_sashwin.o monodll_scrlwing.o \
 @COND_USE_GUI_1_WXUNIV_1@      monodll_sashwin.o monodll_scrlwing.o \

-@COND_USE_GUI_1_WXUNIV_1@      monodll_spinctlg.o monodll_splash.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_splitter.o monodll_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_textdlgg.o monodll_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_tipwin.o monodll_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_vlbox.o monodll_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_wizard.o monodll_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_fontmap.o monodll_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_artprov.o monodll_artstd.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_bmpbase.o monodll_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_clipcmn.o monodll_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_cmndata.o monodll_containr.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_cshelp.o monodll_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_ctrlsub.o monodll_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_dbgrid.o monodll_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_dlgcmn.o monodll_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_dobjcmn.o monodll_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_docview.o monodll_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_dseldlg.o monodll_effects.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_fddlgcmn.o monodll_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_fontcmn.o monodll_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_timercmn.o monodll_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_gaugecmn.o monodll_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_geometry.o monodll_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_helpbase.o monodll_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_imagall.o monodll_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_image.o monodll_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_imagiff.o monodll_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_imagpcx.o monodll_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_imagpnm.o monodll_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_imagxpm.o monodll_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_layout.o monodll_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_matrix.o monodll_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_nbkbase.o monodll_paper.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_popupcmn.o monodll_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_quantize.o monodll_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_rgncmn.o monodll_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_sizer.o monodll_statbar.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_tbarbase.o monodll_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_treebase.o monodll_valgen.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_validate.o monodll_valtext.o \
-@COND_USE_GUI_1_WXUNIV_1@      monodll_wincmn.o monodll_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@      monodll_selstore.o monodll_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_splash.o monodll_splitter.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_tbarsmpl.o monodll_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_tipdlg.o monodll_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_treectlg.o monodll_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_vscroll.o monodll_wizard.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_appcmn.o monodll_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_accesscmn.o monodll_artprov.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_artstd.o monodll_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_choiccmn.o monodll_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_cmdproc.o monodll_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_containr.o monodll_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_ctrlcmn.o monodll_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_datacmn.o monodll_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_dcbase.o monodll_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_dndcmn.o monodll_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_docmdi.o monodll_docview.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_dpycmn.o monodll_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_effects.o monodll_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_fldlgcmn.o monodll_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_framecmn.o monodll_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_toplvcmn.o monodll_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_gdicmn.o monodll_geometry.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_gifdecod.o monodll_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_iconbndl.o monodll_imagall.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_imagbmp.o monodll_image.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_imaggif.o monodll_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_imagjpeg.o monodll_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_imagpng.o monodll_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_imagtiff.o monodll_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_imagfill.o monodll_layout.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_lboxcmn.o monodll_matrix.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_menucmn.o monodll_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_paper.o monodll_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_prntbase.o monodll_quantize.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_radiocmn.o monodll_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_settcmn.o monodll_sizer.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_statbar.o monodll_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_textcmn.o monodll_treebase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_valgen.o monodll_validate.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_valtext.o monodll_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monodll_xpmdecod.o

 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS_9) \
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS_9) \

-@COND_USE_GUI_1_WXUNIV_0@      $(__GUI_SRC_OBJECTS_1) monolib_selstore.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_busyinfo.o monolib_calctrl.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_choicdgg.o monolib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_dcpsg.o monolib_dirctrlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_dragimgg.o monolib_grid.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_gridctrl.o monolib_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_laywin.o monolib_logg.o monolib_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_panelg.o monolib_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      $(__GUI_SRC_OBJECTS_1) monolib_busyinfo.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_calctrl.o monolib_choicdgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_dcbuffer.o monolib_dcpsg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_dirctrlg.o monolib_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_grid.o monolib_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_gridsel.o monolib_laywin.o monolib_logg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_numdlgg.o monolib_panelg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_progdlgg.o monolib_renderg.o \

 @COND_USE_GUI_1_WXUNIV_0@      monolib_sashwin.o monolib_scrlwing.o \
 @COND_USE_GUI_1_WXUNIV_0@      monolib_sashwin.o monolib_scrlwing.o \

-@COND_USE_GUI_1_WXUNIV_0@      monolib_spinctlg.o monolib_splash.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_splitter.o monolib_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_textdlgg.o monolib_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_tipwin.o monolib_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_vlbox.o monolib_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_wizard.o monolib_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_fontmap.o monolib_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_artprov.o monolib_artstd.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_bmpbase.o monolib_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_clipcmn.o monolib_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_cmndata.o monolib_containr.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_cshelp.o monolib_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_ctrlsub.o monolib_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_dbgrid.o monolib_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_dlgcmn.o monolib_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_dobjcmn.o monolib_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_docview.o monolib_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_dseldlg.o monolib_effects.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_fddlgcmn.o monolib_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_fontcmn.o monolib_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_timercmn.o monolib_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_gaugecmn.o monolib_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_geometry.o monolib_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_helpbase.o monolib_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_imagall.o monolib_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_image.o monolib_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_imagiff.o monolib_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_imagpcx.o monolib_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_imagpnm.o monolib_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_imagxpm.o monolib_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_layout.o monolib_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_matrix.o monolib_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_nbkbase.o monolib_paper.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_popupcmn.o monolib_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_quantize.o monolib_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_rgncmn.o monolib_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_sizer.o monolib_statbar.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_tbarbase.o monolib_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_treebase.o monolib_valgen.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_validate.o monolib_valtext.o \
-@COND_USE_GUI_1_WXUNIV_0@      monolib_wincmn.o monolib_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@      monolib_selstore.o monolib_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_splash.o monolib_splitter.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_tbarsmpl.o monolib_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_tipdlg.o monolib_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_treectlg.o monolib_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_vscroll.o monolib_wizard.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_appcmn.o monolib_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_accesscmn.o monolib_artprov.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_artstd.o monolib_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_choiccmn.o monolib_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_cmdproc.o monolib_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_containr.o monolib_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_ctrlcmn.o monolib_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_datacmn.o monolib_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_dcbase.o monolib_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_dndcmn.o monolib_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_docmdi.o monolib_docview.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_dpycmn.o monolib_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_effects.o monolib_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_fldlgcmn.o monolib_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_framecmn.o monolib_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_toplvcmn.o monolib_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_gdicmn.o monolib_geometry.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_gifdecod.o monolib_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_iconbndl.o monolib_imagall.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_imagbmp.o monolib_image.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_imaggif.o monolib_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_imagjpeg.o monolib_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_imagpng.o monolib_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_imagtiff.o monolib_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_imagfill.o monolib_layout.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_lboxcmn.o monolib_matrix.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_menucmn.o monolib_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_paper.o monolib_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_prntbase.o monolib_quantize.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_radiocmn.o monolib_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_settcmn.o monolib_sizer.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_statbar.o monolib_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_textcmn.o monolib_treebase.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_valgen.o monolib_validate.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_valtext.o monolib_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      monolib_xpmdecod.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS_9) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS_1) monolib_bmpbuttn.o \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS_9) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS_1) monolib_bmpbuttn.o \


@@ -831,108 +833,110 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@      monolib_accel.o monolib_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monolib_fdrepdlg.o monolib_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monolib_tabg.o monolib_gtk.o monolib_win32.o \
 @COND_USE_GUI_1_WXUNIV_1@      monolib_accel.o monolib_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monolib_fdrepdlg.o monolib_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      monolib_tabg.o monolib_gtk.o monolib_win32.o \

-@COND_USE_GUI_1_WXUNIV_1@      monolib_metal.o monolib_selstore.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_busyinfo.o monolib_calctrl.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_choicdgg.o monolib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_dcpsg.o monolib_dirctrlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_dragimgg.o monolib_grid.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_gridctrl.o monolib_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_laywin.o monolib_logg.o monolib_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_panelg.o monolib_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_metal.o monolib_busyinfo.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_calctrl.o monolib_choicdgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_dcbuffer.o monolib_dcpsg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_dirctrlg.o monolib_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_grid.o monolib_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_gridsel.o monolib_laywin.o monolib_logg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_numdlgg.o monolib_panelg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_progdlgg.o monolib_renderg.o \

 @COND_USE_GUI_1_WXUNIV_1@      monolib_sashwin.o monolib_scrlwing.o \
 @COND_USE_GUI_1_WXUNIV_1@      monolib_sashwin.o monolib_scrlwing.o \

-@COND_USE_GUI_1_WXUNIV_1@      monolib_spinctlg.o monolib_splash.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_splitter.o monolib_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_textdlgg.o monolib_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_tipwin.o monolib_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_vlbox.o monolib_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_wizard.o monolib_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_fontmap.o monolib_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_artprov.o monolib_artstd.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_bmpbase.o monolib_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_clipcmn.o monolib_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_cmndata.o monolib_containr.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_cshelp.o monolib_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_ctrlsub.o monolib_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_dbgrid.o monolib_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_dlgcmn.o monolib_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_dobjcmn.o monolib_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_docview.o monolib_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_dseldlg.o monolib_effects.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_fddlgcmn.o monolib_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_fontcmn.o monolib_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_timercmn.o monolib_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_gaugecmn.o monolib_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_geometry.o monolib_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_helpbase.o monolib_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_imagall.o monolib_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_image.o monolib_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_imagiff.o monolib_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_imagpcx.o monolib_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_imagpnm.o monolib_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_imagxpm.o monolib_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_layout.o monolib_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_matrix.o monolib_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_nbkbase.o monolib_paper.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_popupcmn.o monolib_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_quantize.o monolib_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_rgncmn.o monolib_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_sizer.o monolib_statbar.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_tbarbase.o monolib_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_treebase.o monolib_valgen.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_validate.o monolib_valtext.o \
-@COND_USE_GUI_1_WXUNIV_1@      monolib_wincmn.o monolib_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@      monolib_selstore.o monolib_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_splash.o monolib_splitter.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_tbarsmpl.o monolib_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_tipdlg.o monolib_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_treectlg.o monolib_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_vscroll.o monolib_wizard.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_appcmn.o monolib_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_accesscmn.o monolib_artprov.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_artstd.o monolib_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_choiccmn.o monolib_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_cmdproc.o monolib_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_containr.o monolib_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_ctrlcmn.o monolib_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_datacmn.o monolib_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_dcbase.o monolib_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_dndcmn.o monolib_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_docmdi.o monolib_docview.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_dpycmn.o monolib_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_effects.o monolib_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_fldlgcmn.o monolib_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_framecmn.o monolib_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_toplvcmn.o monolib_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_gdicmn.o monolib_geometry.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_gifdecod.o monolib_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_iconbndl.o monolib_imagall.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_imagbmp.o monolib_image.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_imaggif.o monolib_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_imagjpeg.o monolib_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_imagpng.o monolib_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_imagtiff.o monolib_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_imagfill.o monolib_layout.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_lboxcmn.o monolib_matrix.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_menucmn.o monolib_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_paper.o monolib_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_prntbase.o monolib_quantize.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_radiocmn.o monolib_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_settcmn.o monolib_sizer.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_statbar.o monolib_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_textcmn.o monolib_treebase.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_valgen.o monolib_validate.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_valtext.o monolib_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      monolib_xpmdecod.o

 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS_0) \
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS_0) \

-@COND_USE_GUI_1_WXUNIV_0@      $(__GUI_SRC_OBJECTS_2) coredll_selstore.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_busyinfo.o coredll_calctrl.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_choicdgg.o coredll_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_dcpsg.o coredll_dirctrlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_dragimgg.o coredll_grid.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_gridctrl.o coredll_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_laywin.o coredll_logg.o coredll_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_panelg.o coredll_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      $(__GUI_SRC_OBJECTS_2) coredll_busyinfo.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_calctrl.o coredll_choicdgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_dcbuffer.o coredll_dcpsg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_dirctrlg.o coredll_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_grid.o coredll_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_gridsel.o coredll_laywin.o coredll_logg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_numdlgg.o coredll_panelg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_progdlgg.o coredll_renderg.o \

 @COND_USE_GUI_1_WXUNIV_0@      coredll_sashwin.o coredll_scrlwing.o \
 @COND_USE_GUI_1_WXUNIV_0@      coredll_sashwin.o coredll_scrlwing.o \

-@COND_USE_GUI_1_WXUNIV_0@      coredll_spinctlg.o coredll_splash.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_splitter.o coredll_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_textdlgg.o coredll_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_tipwin.o coredll_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_vlbox.o coredll_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_wizard.o coredll_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_fontmap.o coredll_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_artprov.o coredll_artstd.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_bmpbase.o coredll_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_clipcmn.o coredll_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_cmndata.o coredll_containr.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_cshelp.o coredll_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_ctrlsub.o coredll_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_dbgrid.o coredll_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_dlgcmn.o coredll_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_dobjcmn.o coredll_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_docview.o coredll_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_dseldlg.o coredll_effects.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_fddlgcmn.o coredll_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_fontcmn.o coredll_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_timercmn.o coredll_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_gaugecmn.o coredll_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_geometry.o coredll_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_helpbase.o coredll_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_imagall.o coredll_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_image.o coredll_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_imagiff.o coredll_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_imagpcx.o coredll_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_imagpnm.o coredll_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_imagxpm.o coredll_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_layout.o coredll_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_matrix.o coredll_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_nbkbase.o coredll_paper.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_popupcmn.o coredll_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_quantize.o coredll_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_rgncmn.o coredll_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_sizer.o coredll_statbar.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_tbarbase.o coredll_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_treebase.o coredll_valgen.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_validate.o coredll_valtext.o \
-@COND_USE_GUI_1_WXUNIV_0@      coredll_wincmn.o coredll_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@      coredll_selstore.o coredll_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_splash.o coredll_splitter.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_tbarsmpl.o coredll_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_tipdlg.o coredll_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_treectlg.o coredll_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_vscroll.o coredll_wizard.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_appcmn.o coredll_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_accesscmn.o coredll_artprov.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_artstd.o coredll_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_choiccmn.o coredll_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_cmdproc.o coredll_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_containr.o coredll_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_ctrlcmn.o coredll_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_datacmn.o coredll_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_dcbase.o coredll_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_dndcmn.o coredll_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_docmdi.o coredll_docview.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_dpycmn.o coredll_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_effects.o coredll_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_fldlgcmn.o coredll_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_framecmn.o coredll_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_toplvcmn.o coredll_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_gdicmn.o coredll_geometry.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_gifdecod.o coredll_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_iconbndl.o coredll_imagall.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_imagbmp.o coredll_image.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_imaggif.o coredll_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_imagjpeg.o coredll_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_imagpng.o coredll_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_imagtiff.o coredll_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_imagfill.o coredll_layout.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_lboxcmn.o coredll_matrix.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_menucmn.o coredll_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_paper.o coredll_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_prntbase.o coredll_quantize.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_radiocmn.o coredll_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_settcmn.o coredll_sizer.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_statbar.o coredll_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_textcmn.o coredll_treebase.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_valgen.o coredll_validate.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_valtext.o coredll_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      coredll_xpmdecod.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS_0) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS_2) coredll_bmpbuttn.o \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS_0) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS_2) coredll_bmpbuttn.o \


@@ -958,108 +962,110 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@      coredll_accel.o coredll_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      coredll_fdrepdlg.o coredll_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      coredll_tabg.o coredll_gtk.o coredll_win32.o \
 @COND_USE_GUI_1_WXUNIV_1@      coredll_accel.o coredll_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      coredll_fdrepdlg.o coredll_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      coredll_tabg.o coredll_gtk.o coredll_win32.o \

-@COND_USE_GUI_1_WXUNIV_1@      coredll_metal.o coredll_selstore.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_busyinfo.o coredll_calctrl.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_choicdgg.o coredll_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_dcpsg.o coredll_dirctrlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_dragimgg.o coredll_grid.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_gridctrl.o coredll_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_laywin.o coredll_logg.o coredll_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_panelg.o coredll_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_metal.o coredll_busyinfo.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_calctrl.o coredll_choicdgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_dcbuffer.o coredll_dcpsg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_dirctrlg.o coredll_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_grid.o coredll_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_gridsel.o coredll_laywin.o coredll_logg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_numdlgg.o coredll_panelg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_progdlgg.o coredll_renderg.o \

 @COND_USE_GUI_1_WXUNIV_1@      coredll_sashwin.o coredll_scrlwing.o \
 @COND_USE_GUI_1_WXUNIV_1@      coredll_sashwin.o coredll_scrlwing.o \

-@COND_USE_GUI_1_WXUNIV_1@      coredll_spinctlg.o coredll_splash.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_splitter.o coredll_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_textdlgg.o coredll_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_tipwin.o coredll_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_vlbox.o coredll_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_wizard.o coredll_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_fontmap.o coredll_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_artprov.o coredll_artstd.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_bmpbase.o coredll_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_clipcmn.o coredll_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_cmndata.o coredll_containr.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_cshelp.o coredll_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_ctrlsub.o coredll_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_dbgrid.o coredll_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_dlgcmn.o coredll_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_dobjcmn.o coredll_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_docview.o coredll_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_dseldlg.o coredll_effects.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_fddlgcmn.o coredll_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_fontcmn.o coredll_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_timercmn.o coredll_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_gaugecmn.o coredll_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_geometry.o coredll_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_helpbase.o coredll_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_imagall.o coredll_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_image.o coredll_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_imagiff.o coredll_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_imagpcx.o coredll_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_imagpnm.o coredll_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_imagxpm.o coredll_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_layout.o coredll_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_matrix.o coredll_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_nbkbase.o coredll_paper.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_popupcmn.o coredll_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_quantize.o coredll_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_rgncmn.o coredll_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_sizer.o coredll_statbar.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_tbarbase.o coredll_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_treebase.o coredll_valgen.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_validate.o coredll_valtext.o \
-@COND_USE_GUI_1_WXUNIV_1@      coredll_wincmn.o coredll_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@      coredll_selstore.o coredll_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_splash.o coredll_splitter.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_tbarsmpl.o coredll_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_tipdlg.o coredll_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_treectlg.o coredll_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_vscroll.o coredll_wizard.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_appcmn.o coredll_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_accesscmn.o coredll_artprov.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_artstd.o coredll_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_choiccmn.o coredll_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_cmdproc.o coredll_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_containr.o coredll_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_ctrlcmn.o coredll_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_datacmn.o coredll_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_dcbase.o coredll_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_dndcmn.o coredll_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_docmdi.o coredll_docview.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_dpycmn.o coredll_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_effects.o coredll_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_fldlgcmn.o coredll_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_framecmn.o coredll_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_toplvcmn.o coredll_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_gdicmn.o coredll_geometry.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_gifdecod.o coredll_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_iconbndl.o coredll_imagall.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_imagbmp.o coredll_image.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_imaggif.o coredll_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_imagjpeg.o coredll_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_imagpng.o coredll_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_imagtiff.o coredll_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_imagfill.o coredll_layout.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_lboxcmn.o coredll_matrix.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_menucmn.o coredll_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_paper.o coredll_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_prntbase.o coredll_quantize.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_radiocmn.o coredll_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_settcmn.o coredll_sizer.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_statbar.o coredll_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_textcmn.o coredll_treebase.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_valgen.o coredll_validate.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_valtext.o coredll_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      coredll_xpmdecod.o

 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS_8) \
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = \
 @COND_USE_GUI_1_WXUNIV_0@      $(__LOWLEVEL_SRC_OBJECTS_8) \

-@COND_USE_GUI_1_WXUNIV_0@      $(__GUI_SRC_OBJECTS_3) corelib_selstore.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_busyinfo.o corelib_calctrl.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_choicdgg.o corelib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_dcpsg.o corelib_dirctrlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_dragimgg.o corelib_grid.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_gridctrl.o corelib_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_laywin.o corelib_logg.o corelib_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_panelg.o corelib_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      $(__GUI_SRC_OBJECTS_3) corelib_busyinfo.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_calctrl.o corelib_choicdgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_dcbuffer.o corelib_dcpsg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_dirctrlg.o corelib_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_grid.o corelib_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_gridsel.o corelib_laywin.o corelib_logg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_numdlgg.o corelib_panelg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_progdlgg.o corelib_renderg.o \

 @COND_USE_GUI_1_WXUNIV_0@      corelib_sashwin.o corelib_scrlwing.o \
 @COND_USE_GUI_1_WXUNIV_0@      corelib_sashwin.o corelib_scrlwing.o \

-@COND_USE_GUI_1_WXUNIV_0@      corelib_spinctlg.o corelib_splash.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_splitter.o corelib_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_textdlgg.o corelib_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_tipwin.o corelib_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_vlbox.o corelib_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_wizard.o corelib_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_fontmap.o corelib_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_artprov.o corelib_artstd.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_bmpbase.o corelib_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_clipcmn.o corelib_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_cmndata.o corelib_containr.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_cshelp.o corelib_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_ctrlsub.o corelib_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_dbgrid.o corelib_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_dlgcmn.o corelib_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_dobjcmn.o corelib_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_docview.o corelib_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_dseldlg.o corelib_effects.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_fddlgcmn.o corelib_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_fontcmn.o corelib_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_timercmn.o corelib_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_gaugecmn.o corelib_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_geometry.o corelib_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_helpbase.o corelib_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_imagall.o corelib_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_image.o corelib_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_imagiff.o corelib_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_imagpcx.o corelib_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_imagpnm.o corelib_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_imagxpm.o corelib_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_layout.o corelib_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_matrix.o corelib_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_nbkbase.o corelib_paper.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_popupcmn.o corelib_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_quantize.o corelib_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_rgncmn.o corelib_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_sizer.o corelib_statbar.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_tbarbase.o corelib_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_treebase.o corelib_valgen.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_validate.o corelib_valtext.o \
-@COND_USE_GUI_1_WXUNIV_0@      corelib_wincmn.o corelib_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@      corelib_selstore.o corelib_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_splash.o corelib_splitter.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_tbarsmpl.o corelib_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_tipdlg.o corelib_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_treectlg.o corelib_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_vscroll.o corelib_wizard.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_appcmn.o corelib_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_accesscmn.o corelib_artprov.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_artstd.o corelib_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_choiccmn.o corelib_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_cmdproc.o corelib_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_containr.o corelib_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_ctrlcmn.o corelib_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_datacmn.o corelib_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_dcbase.o corelib_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_dndcmn.o corelib_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_docmdi.o corelib_docview.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_dpycmn.o corelib_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_effects.o corelib_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_fldlgcmn.o corelib_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_framecmn.o corelib_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_toplvcmn.o corelib_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_gdicmn.o corelib_geometry.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_gifdecod.o corelib_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_iconbndl.o corelib_imagall.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_imagbmp.o corelib_image.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_imaggif.o corelib_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_imagjpeg.o corelib_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_imagpng.o corelib_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_imagtiff.o corelib_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_imagfill.o corelib_layout.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_lboxcmn.o corelib_matrix.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_menucmn.o corelib_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_paper.o corelib_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_prntbase.o corelib_quantize.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_radiocmn.o corelib_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_settcmn.o corelib_sizer.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_statbar.o corelib_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_textcmn.o corelib_treebase.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_valgen.o corelib_validate.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_valtext.o corelib_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_0@      corelib_xpmdecod.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS_8) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS_3) corelib_bmpbuttn.o \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = \
 @COND_USE_GUI_1_WXUNIV_1@      $(__LOWLEVEL_SRC_OBJECTS_8) \
 @COND_USE_GUI_1_WXUNIV_1@      $(__UNIV_TEXTCTRL_OBJECTS_3) corelib_bmpbuttn.o \


@@ -1085,56 +1091,57 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_USE_GUI_1_WXUNIV_1@      corelib_accel.o corelib_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      corelib_fdrepdlg.o corelib_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      corelib_tabg.o corelib_gtk.o corelib_win32.o \
 @COND_USE_GUI_1_WXUNIV_1@      corelib_accel.o corelib_msgdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      corelib_fdrepdlg.o corelib_fontdlgg.o \
 @COND_USE_GUI_1_WXUNIV_1@      corelib_tabg.o corelib_gtk.o corelib_win32.o \

-@COND_USE_GUI_1_WXUNIV_1@      corelib_metal.o corelib_selstore.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_busyinfo.o corelib_calctrl.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_choicdgg.o corelib_dcbuffer.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_dcpsg.o corelib_dirctrlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_dragimgg.o corelib_grid.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_gridctrl.o corelib_gridsel.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_laywin.o corelib_logg.o corelib_numdlgg.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_panelg.o corelib_progdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_metal.o corelib_busyinfo.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_calctrl.o corelib_choicdgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_dcbuffer.o corelib_dcpsg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_dirctrlg.o corelib_dragimgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_grid.o corelib_gridctrl.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_gridsel.o corelib_laywin.o corelib_logg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_numdlgg.o corelib_panelg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_progdlgg.o corelib_renderg.o \

 @COND_USE_GUI_1_WXUNIV_1@      corelib_sashwin.o corelib_scrlwing.o \
 @COND_USE_GUI_1_WXUNIV_1@      corelib_sashwin.o corelib_scrlwing.o \

-@COND_USE_GUI_1_WXUNIV_1@      corelib_spinctlg.o corelib_splash.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_splitter.o corelib_tbarsmpl.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_textdlgg.o corelib_tipdlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_tipwin.o corelib_treectlg.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_vlbox.o corelib_vscroll.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_wizard.o corelib_appcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_fontmap.o corelib_accesscmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_artprov.o corelib_artstd.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_bmpbase.o corelib_choiccmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_clipcmn.o corelib_cmdproc.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_cmndata.o corelib_containr.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_cshelp.o corelib_ctrlcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_ctrlsub.o corelib_datacmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_dbgrid.o corelib_dcbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_dlgcmn.o corelib_dndcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_dobjcmn.o corelib_docmdi.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_docview.o corelib_dpycmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_dseldlg.o corelib_effects.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_fddlgcmn.o corelib_fldlgcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_fontcmn.o corelib_framecmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_timercmn.o corelib_toplvcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_gaugecmn.o corelib_gdicmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_geometry.o corelib_gifdecod.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_helpbase.o corelib_iconbndl.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_imagall.o corelib_imagbmp.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_image.o corelib_imaggif.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_imagiff.o corelib_imagjpeg.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_imagpcx.o corelib_imagpng.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_imagpnm.o corelib_imagtiff.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_imagxpm.o corelib_imagfill.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_layout.o corelib_lboxcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_matrix.o corelib_menucmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_nbkbase.o corelib_paper.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_popupcmn.o corelib_prntbase.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_quantize.o corelib_radiocmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_rgncmn.o corelib_settcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_sizer.o corelib_statbar.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_tbarbase.o corelib_textcmn.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_treebase.o corelib_valgen.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_validate.o corelib_valtext.o \
-@COND_USE_GUI_1_WXUNIV_1@      corelib_wincmn.o corelib_xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@      corelib_selstore.o corelib_spinctlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_splash.o corelib_splitter.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_tbarsmpl.o corelib_textdlgg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_tipdlg.o corelib_tipwin.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_treectlg.o corelib_vlbox.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_vscroll.o corelib_wizard.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_appcmn.o corelib_fontmap.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_accesscmn.o corelib_artprov.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_artstd.o corelib_bmpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_choiccmn.o corelib_clipcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_cmdproc.o corelib_cmndata.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_containr.o corelib_cshelp.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_ctrlcmn.o corelib_ctrlsub.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_datacmn.o corelib_dbgrid.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_dcbase.o corelib_dlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_dndcmn.o corelib_dobjcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_docmdi.o corelib_docview.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_dpycmn.o corelib_dseldlg.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_effects.o corelib_fddlgcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_fldlgcmn.o corelib_fontcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_framecmn.o corelib_timercmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_toplvcmn.o corelib_gaugecmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_gdicmn.o corelib_geometry.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_gifdecod.o corelib_helpbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_iconbndl.o corelib_imagall.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_imagbmp.o corelib_image.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_imaggif.o corelib_imagiff.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_imagjpeg.o corelib_imagpcx.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_imagpng.o corelib_imagpnm.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_imagtiff.o corelib_imagxpm.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_imagfill.o corelib_layout.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_lboxcmn.o corelib_matrix.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_menucmn.o corelib_nbkbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_paper.o corelib_popupcmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_prntbase.o corelib_quantize.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_radiocmn.o corelib_rgncmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_settcmn.o corelib_sizer.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_statbar.o corelib_tbarbase.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_textcmn.o corelib_treebase.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_valgen.o corelib_validate.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_valtext.o corelib_wincmn.o \
+@COND_USE_GUI_1_WXUNIV_1@      corelib_xpmdecod.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = monodll_NSBox.o \
 @COND_TOOLKIT_COCOA@   monodll_NSButton.o monodll_NSControl.o \
 @COND_TOOLKIT_COCOA@   monodll_NSMenu.o monodll_NSPanel.o \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = monodll_NSBox.o \
 @COND_TOOLKIT_COCOA@   monodll_NSButton.o monodll_NSControl.o \
 @COND_TOOLKIT_COCOA@   monodll_NSMenu.o monodll_NSPanel.o \


@@ -1172,11 +1179,11 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_GTK@     monodll_joystick.o monodll_listbox.o monodll_mdi.o \
 @COND_TOOLKIT_GTK@     monodll_menu.o monodll_minifram.o monodll_msgdlg.o \
 @COND_TOOLKIT_GTK@     monodll_notebook.o monodll_radiobox.o monodll_radiobut.o \
 @COND_TOOLKIT_GTK@     monodll_joystick.o monodll_listbox.o monodll_mdi.o \
 @COND_TOOLKIT_GTK@     monodll_menu.o monodll_minifram.o monodll_msgdlg.o \
 @COND_TOOLKIT_GTK@     monodll_notebook.o monodll_radiobox.o monodll_radiobut.o \

-@COND_TOOLKIT_GTK@     monodll_scrolbar.o monodll_scrolwin.o monodll_slider.o \
-@COND_TOOLKIT_GTK@     monodll_spinbutt.o monodll_spinctrl.o monodll_statbmp.o \
-@COND_TOOLKIT_GTK@     monodll_statbox.o monodll_statline.o monodll_stattext.o \
-@COND_TOOLKIT_GTK@     monodll_tbargtk.o monodll_textctrl.o monodll_tglbtn.o \
-@COND_TOOLKIT_GTK@     monodll_utilsres.o monodll_wave.o
+@COND_TOOLKIT_GTK@     monodll_renderer.o monodll_scrolbar.o monodll_scrolwin.o \
+@COND_TOOLKIT_GTK@     monodll_slider.o monodll_spinbutt.o monodll_spinctrl.o \
+@COND_TOOLKIT_GTK@     monodll_statbmp.o monodll_statbox.o monodll_statline.o \
+@COND_TOOLKIT_GTK@     monodll_stattext.o monodll_tbargtk.o monodll_textctrl.o \
+@COND_TOOLKIT_GTK@     monodll_tglbtn.o monodll_utilsres.o monodll_wave.o

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = monodll_accel.o \
 @COND_TOOLKIT_MAC@     monodll_aga.o monodll_app.o monodll_bitmap.o \
 @COND_TOOLKIT_MAC@     monodll_bmpbuttn.o monodll_brush.o monodll_button.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = monodll_accel.o \
 @COND_TOOLKIT_MAC@     monodll_aga.o monodll_app.o monodll_bitmap.o \
 @COND_TOOLKIT_MAC@     monodll_bmpbuttn.o monodll_brush.o monodll_button.o \


@@ -1195,16 +1202,17 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MAC@     monodll_msgdlg.o monodll_notebmac.o monodll_palette.o \
 @COND_TOOLKIT_MAC@     monodll_pen.o monodll_pnghand.o monodll_printdlg.o \
 @COND_TOOLKIT_MAC@     monodll_printmac.o monodll_radiobox.o monodll_radiobut.o \
 @COND_TOOLKIT_MAC@     monodll_msgdlg.o monodll_notebmac.o monodll_palette.o \
 @COND_TOOLKIT_MAC@     monodll_pen.o monodll_pnghand.o monodll_printdlg.o \
 @COND_TOOLKIT_MAC@     monodll_printmac.o monodll_radiobox.o monodll_radiobut.o \

-@COND_TOOLKIT_MAC@     monodll_region.o monodll_scrolbar.o monodll_settings.o \
-@COND_TOOLKIT_MAC@     monodll_slider.o monodll_spinbutt.o monodll_statbmp.o \
-@COND_TOOLKIT_MAC@     monodll_statbox.o monodll_statbrma.o monodll_statlmac.o \
-@COND_TOOLKIT_MAC@     monodll_stattext.o monodll_tabctrl.o monodll_textctrl.o \
-@COND_TOOLKIT_MAC@     monodll_thread.o monodll_timer.o monodll_toplevel.o \
-@COND_TOOLKIT_MAC@     monodll_toolbar.o monodll_tooltip.o monodll_uma.o \
-@COND_TOOLKIT_MAC@     monodll_wave.o monodll_window.o monodll_MoreFilesX.o \
-@COND_TOOLKIT_MAC@     monodll_statusbr.o monodll_imaglist.o monodll_listctrl.o \
-@COND_TOOLKIT_MAC@     monodll_fdrepdlg.o monodll_tabg.o monodll_fontdlgg.o \
-@COND_TOOLKIT_MAC@     monodll_caret.o monodll_snglinst.o
+@COND_TOOLKIT_MAC@     monodll_region.o monodll_renderer.o monodll_scrolbar.o \
+@COND_TOOLKIT_MAC@     monodll_settings.o monodll_slider.o monodll_spinbutt.o \
+@COND_TOOLKIT_MAC@     monodll_statbmp.o monodll_statbox.o monodll_statbrma.o \
+@COND_TOOLKIT_MAC@     monodll_statlmac.o monodll_stattext.o monodll_tabctrl.o \
+@COND_TOOLKIT_MAC@     monodll_textctrl.o monodll_thread.o monodll_timer.o \
+@COND_TOOLKIT_MAC@     monodll_toplevel.o monodll_toolbar.o monodll_tooltip.o \
+@COND_TOOLKIT_MAC@     monodll_uma.o monodll_wave.o monodll_window.o \
+@COND_TOOLKIT_MAC@     monodll_MoreFilesX.o monodll_statusbr.o \
+@COND_TOOLKIT_MAC@     monodll_imaglist.o monodll_listctrl.o monodll_fdrepdlg.o \
+@COND_TOOLKIT_MAC@     monodll_tabg.o monodll_fontdlgg.o monodll_caret.o \
+@COND_TOOLKIT_MAC@     monodll_snglinst.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = \
 @COND_TOOLKIT_MOTIF@   monodll_gsockmot.o monodll_accel.o monodll_app.o \
 @COND_TOOLKIT_MOTIF@   monodll_bmpbuttn.o monodll_bmpmotif.o monodll_button.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = \
 @COND_TOOLKIT_MOTIF@   monodll_gsockmot.o monodll_accel.o monodll_app.o \
 @COND_TOOLKIT_MOTIF@   monodll_bmpbuttn.o monodll_bmpmotif.o monodll_button.o \


@@ -1241,12 +1249,12 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MSW@     monodll_menuitem.o monodll_metafile.o monodll_msgdlg.o \
 @COND_TOOLKIT_MSW@     monodll_nativdlg.o monodll_notebook.o monodll_ownerdrw.o \
 @COND_TOOLKIT_MSW@     monodll_penwin.o monodll_printdlg.o monodll_printwin.o \
 @COND_TOOLKIT_MSW@     monodll_menuitem.o monodll_metafile.o monodll_msgdlg.o \
 @COND_TOOLKIT_MSW@     monodll_nativdlg.o monodll_notebook.o monodll_ownerdrw.o \
 @COND_TOOLKIT_MSW@     monodll_penwin.o monodll_printdlg.o monodll_printwin.o \

-@COND_TOOLKIT_MSW@     monodll_radiobox.o monodll_radiobut.o monodll_scrolbar.o \
-@COND_TOOLKIT_MSW@     monodll_slider95.o monodll_spinbutt.o monodll_spinctrl.o \
-@COND_TOOLKIT_MSW@     monodll_statbmp.o monodll_statbox.o monodll_statbr95.o \
-@COND_TOOLKIT_MSW@     monodll_statline.o monodll_stattext.o monodll_tabctrl.o \
-@COND_TOOLKIT_MSW@     monodll_tbar95.o monodll_textctrl.o monodll_tglbtn.o \
-@COND_TOOLKIT_MSW@     monodll_treectrl.o
+@COND_TOOLKIT_MSW@     monodll_radiobox.o monodll_radiobut.o monodll_renderer.o \
+@COND_TOOLKIT_MSW@     monodll_scrolbar.o monodll_slider95.o monodll_spinbutt.o \
+@COND_TOOLKIT_MSW@     monodll_spinctrl.o monodll_statbmp.o monodll_statbox.o \
+@COND_TOOLKIT_MSW@     monodll_statbr95.o monodll_statline.o monodll_stattext.o \
+@COND_TOOLKIT_MSW@     monodll_tabctrl.o monodll_tbar95.o monodll_textctrl.o \
+@COND_TOOLKIT_MSW@     monodll_tglbtn.o monodll_treectrl.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = monodll_accel.o \
 @COND_TOOLKIT_OS2@     monodll_app.o monodll_bitmap.o monodll_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     monodll_brush.o monodll_button.o monodll_checkbox.o \
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = monodll_accel.o \
 @COND_TOOLKIT_OS2@     monodll_app.o monodll_bitmap.o monodll_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     monodll_brush.o monodll_button.o monodll_checkbox.o \


@@ -1309,11 +1317,11 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_GTK@     monolib_joystick.o monolib_listbox.o monolib_mdi.o \
 @COND_TOOLKIT_GTK@     monolib_menu.o monolib_minifram.o monolib_msgdlg.o \
 @COND_TOOLKIT_GTK@     monolib_notebook.o monolib_radiobox.o monolib_radiobut.o \
 @COND_TOOLKIT_GTK@     monolib_joystick.o monolib_listbox.o monolib_mdi.o \
 @COND_TOOLKIT_GTK@     monolib_menu.o monolib_minifram.o monolib_msgdlg.o \
 @COND_TOOLKIT_GTK@     monolib_notebook.o monolib_radiobox.o monolib_radiobut.o \

-@COND_TOOLKIT_GTK@     monolib_scrolbar.o monolib_scrolwin.o monolib_slider.o \
-@COND_TOOLKIT_GTK@     monolib_spinbutt.o monolib_spinctrl.o monolib_statbmp.o \
-@COND_TOOLKIT_GTK@     monolib_statbox.o monolib_statline.o monolib_stattext.o \
-@COND_TOOLKIT_GTK@     monolib_tbargtk.o monolib_textctrl.o monolib_tglbtn.o \
-@COND_TOOLKIT_GTK@     monolib_utilsres.o monolib_wave.o
+@COND_TOOLKIT_GTK@     monolib_renderer.o monolib_scrolbar.o monolib_scrolwin.o \
+@COND_TOOLKIT_GTK@     monolib_slider.o monolib_spinbutt.o monolib_spinctrl.o \
+@COND_TOOLKIT_GTK@     monolib_statbmp.o monolib_statbox.o monolib_statline.o \
+@COND_TOOLKIT_GTK@     monolib_stattext.o monolib_tbargtk.o monolib_textctrl.o \
+@COND_TOOLKIT_GTK@     monolib_tglbtn.o monolib_utilsres.o monolib_wave.o

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = monolib_accel.o \
 @COND_TOOLKIT_MAC@     monolib_aga.o monolib_app.o monolib_bitmap.o \
 @COND_TOOLKIT_MAC@     monolib_bmpbuttn.o monolib_brush.o monolib_button.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = monolib_accel.o \
 @COND_TOOLKIT_MAC@     monolib_aga.o monolib_app.o monolib_bitmap.o \
 @COND_TOOLKIT_MAC@     monolib_bmpbuttn.o monolib_brush.o monolib_button.o \


@@ -1332,16 +1340,17 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MAC@     monolib_msgdlg.o monolib_notebmac.o monolib_palette.o \
 @COND_TOOLKIT_MAC@     monolib_pen.o monolib_pnghand.o monolib_printdlg.o \
 @COND_TOOLKIT_MAC@     monolib_printmac.o monolib_radiobox.o monolib_radiobut.o \
 @COND_TOOLKIT_MAC@     monolib_msgdlg.o monolib_notebmac.o monolib_palette.o \
 @COND_TOOLKIT_MAC@     monolib_pen.o monolib_pnghand.o monolib_printdlg.o \
 @COND_TOOLKIT_MAC@     monolib_printmac.o monolib_radiobox.o monolib_radiobut.o \

-@COND_TOOLKIT_MAC@     monolib_region.o monolib_scrolbar.o monolib_settings.o \
-@COND_TOOLKIT_MAC@     monolib_slider.o monolib_spinbutt.o monolib_statbmp.o \
-@COND_TOOLKIT_MAC@     monolib_statbox.o monolib_statbrma.o monolib_statlmac.o \
-@COND_TOOLKIT_MAC@     monolib_stattext.o monolib_tabctrl.o monolib_textctrl.o \
-@COND_TOOLKIT_MAC@     monolib_thread.o monolib_timer.o monolib_toplevel.o \
-@COND_TOOLKIT_MAC@     monolib_toolbar.o monolib_tooltip.o monolib_uma.o \
-@COND_TOOLKIT_MAC@     monolib_wave.o monolib_window.o monolib_MoreFilesX.o \
-@COND_TOOLKIT_MAC@     monolib_statusbr.o monolib_imaglist.o monolib_listctrl.o \
-@COND_TOOLKIT_MAC@     monolib_fdrepdlg.o monolib_tabg.o monolib_fontdlgg.o \
-@COND_TOOLKIT_MAC@     monolib_caret.o monolib_snglinst.o
+@COND_TOOLKIT_MAC@     monolib_region.o monolib_renderer.o monolib_scrolbar.o \
+@COND_TOOLKIT_MAC@     monolib_settings.o monolib_slider.o monolib_spinbutt.o \
+@COND_TOOLKIT_MAC@     monolib_statbmp.o monolib_statbox.o monolib_statbrma.o \
+@COND_TOOLKIT_MAC@     monolib_statlmac.o monolib_stattext.o monolib_tabctrl.o \
+@COND_TOOLKIT_MAC@     monolib_textctrl.o monolib_thread.o monolib_timer.o \
+@COND_TOOLKIT_MAC@     monolib_toplevel.o monolib_toolbar.o monolib_tooltip.o \
+@COND_TOOLKIT_MAC@     monolib_uma.o monolib_wave.o monolib_window.o \
+@COND_TOOLKIT_MAC@     monolib_MoreFilesX.o monolib_statusbr.o \
+@COND_TOOLKIT_MAC@     monolib_imaglist.o monolib_listctrl.o monolib_fdrepdlg.o \
+@COND_TOOLKIT_MAC@     monolib_tabg.o monolib_fontdlgg.o monolib_caret.o \
+@COND_TOOLKIT_MAC@     monolib_snglinst.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_MOTIF@   monolib_gsockmot.o monolib_accel.o monolib_app.o \
 @COND_TOOLKIT_MOTIF@   monolib_bmpbuttn.o monolib_bmpmotif.o monolib_button.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_MOTIF@   monolib_gsockmot.o monolib_accel.o monolib_app.o \
 @COND_TOOLKIT_MOTIF@   monolib_bmpbuttn.o monolib_bmpmotif.o monolib_button.o \


@@ -1378,12 +1387,12 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MSW@     monolib_menuitem.o monolib_metafile.o monolib_msgdlg.o \
 @COND_TOOLKIT_MSW@     monolib_nativdlg.o monolib_notebook.o monolib_ownerdrw.o \
 @COND_TOOLKIT_MSW@     monolib_penwin.o monolib_printdlg.o monolib_printwin.o \
 @COND_TOOLKIT_MSW@     monolib_menuitem.o monolib_metafile.o monolib_msgdlg.o \
 @COND_TOOLKIT_MSW@     monolib_nativdlg.o monolib_notebook.o monolib_ownerdrw.o \
 @COND_TOOLKIT_MSW@     monolib_penwin.o monolib_printdlg.o monolib_printwin.o \

-@COND_TOOLKIT_MSW@     monolib_radiobox.o monolib_radiobut.o monolib_scrolbar.o \
-@COND_TOOLKIT_MSW@     monolib_slider95.o monolib_spinbutt.o monolib_spinctrl.o \
-@COND_TOOLKIT_MSW@     monolib_statbmp.o monolib_statbox.o monolib_statbr95.o \
-@COND_TOOLKIT_MSW@     monolib_statline.o monolib_stattext.o monolib_tabctrl.o \
-@COND_TOOLKIT_MSW@     monolib_tbar95.o monolib_textctrl.o monolib_tglbtn.o \
-@COND_TOOLKIT_MSW@     monolib_treectrl.o
+@COND_TOOLKIT_MSW@     monolib_radiobox.o monolib_radiobut.o monolib_renderer.o \
+@COND_TOOLKIT_MSW@     monolib_scrolbar.o monolib_slider95.o monolib_spinbutt.o \
+@COND_TOOLKIT_MSW@     monolib_spinctrl.o monolib_statbmp.o monolib_statbox.o \
+@COND_TOOLKIT_MSW@     monolib_statbr95.o monolib_statline.o monolib_stattext.o \
+@COND_TOOLKIT_MSW@     monolib_tabctrl.o monolib_tbar95.o monolib_textctrl.o \
+@COND_TOOLKIT_MSW@     monolib_tglbtn.o monolib_treectrl.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = monolib_accel.o \
 @COND_TOOLKIT_OS2@     monolib_app.o monolib_bitmap.o monolib_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     monolib_brush.o monolib_button.o monolib_checkbox.o \
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = monolib_accel.o \
 @COND_TOOLKIT_OS2@     monolib_app.o monolib_bitmap.o monolib_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     monolib_brush.o monolib_button.o monolib_checkbox.o \


@@ -1446,11 +1455,11 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_GTK@     coredll_joystick.o coredll_listbox.o coredll_mdi.o \
 @COND_TOOLKIT_GTK@     coredll_menu.o coredll_minifram.o coredll_msgdlg.o \
 @COND_TOOLKIT_GTK@     coredll_notebook.o coredll_radiobox.o coredll_radiobut.o \
 @COND_TOOLKIT_GTK@     coredll_joystick.o coredll_listbox.o coredll_mdi.o \
 @COND_TOOLKIT_GTK@     coredll_menu.o coredll_minifram.o coredll_msgdlg.o \
 @COND_TOOLKIT_GTK@     coredll_notebook.o coredll_radiobox.o coredll_radiobut.o \

-@COND_TOOLKIT_GTK@     coredll_scrolbar.o coredll_scrolwin.o coredll_slider.o \
-@COND_TOOLKIT_GTK@     coredll_spinbutt.o coredll_spinctrl.o coredll_statbmp.o \
-@COND_TOOLKIT_GTK@     coredll_statbox.o coredll_statline.o coredll_stattext.o \
-@COND_TOOLKIT_GTK@     coredll_tbargtk.o coredll_textctrl.o coredll_tglbtn.o \
-@COND_TOOLKIT_GTK@     coredll_utilsres.o coredll_wave.o
+@COND_TOOLKIT_GTK@     coredll_renderer.o coredll_scrolbar.o coredll_scrolwin.o \
+@COND_TOOLKIT_GTK@     coredll_slider.o coredll_spinbutt.o coredll_spinctrl.o \
+@COND_TOOLKIT_GTK@     coredll_statbmp.o coredll_statbox.o coredll_statline.o \
+@COND_TOOLKIT_GTK@     coredll_stattext.o coredll_tbargtk.o coredll_textctrl.o \
+@COND_TOOLKIT_GTK@     coredll_tglbtn.o coredll_utilsres.o coredll_wave.o

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = coredll_accel.o \
 @COND_TOOLKIT_MAC@     coredll_aga.o coredll_app.o coredll_bitmap.o \
 @COND_TOOLKIT_MAC@     coredll_bmpbuttn.o coredll_brush.o coredll_button.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = coredll_accel.o \
 @COND_TOOLKIT_MAC@     coredll_aga.o coredll_app.o coredll_bitmap.o \
 @COND_TOOLKIT_MAC@     coredll_bmpbuttn.o coredll_brush.o coredll_button.o \


@@ -1469,16 +1478,17 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MAC@     coredll_msgdlg.o coredll_notebmac.o coredll_palette.o \
 @COND_TOOLKIT_MAC@     coredll_pen.o coredll_pnghand.o coredll_printdlg.o \
 @COND_TOOLKIT_MAC@     coredll_printmac.o coredll_radiobox.o coredll_radiobut.o \
 @COND_TOOLKIT_MAC@     coredll_msgdlg.o coredll_notebmac.o coredll_palette.o \
 @COND_TOOLKIT_MAC@     coredll_pen.o coredll_pnghand.o coredll_printdlg.o \
 @COND_TOOLKIT_MAC@     coredll_printmac.o coredll_radiobox.o coredll_radiobut.o \

-@COND_TOOLKIT_MAC@     coredll_region.o coredll_scrolbar.o coredll_settings.o \
-@COND_TOOLKIT_MAC@     coredll_slider.o coredll_spinbutt.o coredll_statbmp.o \
-@COND_TOOLKIT_MAC@     coredll_statbox.o coredll_statbrma.o coredll_statlmac.o \
-@COND_TOOLKIT_MAC@     coredll_stattext.o coredll_tabctrl.o coredll_textctrl.o \
-@COND_TOOLKIT_MAC@     coredll_thread.o coredll_timer.o coredll_toplevel.o \
-@COND_TOOLKIT_MAC@     coredll_toolbar.o coredll_tooltip.o coredll_uma.o \
-@COND_TOOLKIT_MAC@     coredll_wave.o coredll_window.o coredll_MoreFilesX.o \
-@COND_TOOLKIT_MAC@     coredll_statusbr.o coredll_imaglist.o coredll_listctrl.o \
-@COND_TOOLKIT_MAC@     coredll_fdrepdlg.o coredll_tabg.o coredll_fontdlgg.o \
-@COND_TOOLKIT_MAC@     coredll_caret.o coredll_snglinst.o
+@COND_TOOLKIT_MAC@     coredll_region.o coredll_renderer.o coredll_scrolbar.o \
+@COND_TOOLKIT_MAC@     coredll_settings.o coredll_slider.o coredll_spinbutt.o \
+@COND_TOOLKIT_MAC@     coredll_statbmp.o coredll_statbox.o coredll_statbrma.o \
+@COND_TOOLKIT_MAC@     coredll_statlmac.o coredll_stattext.o coredll_tabctrl.o \
+@COND_TOOLKIT_MAC@     coredll_textctrl.o coredll_thread.o coredll_timer.o \
+@COND_TOOLKIT_MAC@     coredll_toplevel.o coredll_toolbar.o coredll_tooltip.o \
+@COND_TOOLKIT_MAC@     coredll_uma.o coredll_wave.o coredll_window.o \
+@COND_TOOLKIT_MAC@     coredll_MoreFilesX.o coredll_statusbr.o \
+@COND_TOOLKIT_MAC@     coredll_imaglist.o coredll_listctrl.o coredll_fdrepdlg.o \
+@COND_TOOLKIT_MAC@     coredll_tabg.o coredll_fontdlgg.o coredll_caret.o \
+@COND_TOOLKIT_MAC@     coredll_snglinst.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = \
 @COND_TOOLKIT_MOTIF@   coredll_gsockmot.o coredll_accel.o coredll_app.o \
 @COND_TOOLKIT_MOTIF@   coredll_bmpbuttn.o coredll_bmpmotif.o coredll_button.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = \
 @COND_TOOLKIT_MOTIF@   coredll_gsockmot.o coredll_accel.o coredll_app.o \
 @COND_TOOLKIT_MOTIF@   coredll_bmpbuttn.o coredll_bmpmotif.o coredll_button.o \


@@ -1515,12 +1525,12 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MSW@     coredll_menuitem.o coredll_metafile.o coredll_msgdlg.o \
 @COND_TOOLKIT_MSW@     coredll_nativdlg.o coredll_notebook.o coredll_ownerdrw.o \
 @COND_TOOLKIT_MSW@     coredll_penwin.o coredll_printdlg.o coredll_printwin.o \
 @COND_TOOLKIT_MSW@     coredll_menuitem.o coredll_metafile.o coredll_msgdlg.o \
 @COND_TOOLKIT_MSW@     coredll_nativdlg.o coredll_notebook.o coredll_ownerdrw.o \
 @COND_TOOLKIT_MSW@     coredll_penwin.o coredll_printdlg.o coredll_printwin.o \

-@COND_TOOLKIT_MSW@     coredll_radiobox.o coredll_radiobut.o coredll_scrolbar.o \
-@COND_TOOLKIT_MSW@     coredll_slider95.o coredll_spinbutt.o coredll_spinctrl.o \
-@COND_TOOLKIT_MSW@     coredll_statbmp.o coredll_statbox.o coredll_statbr95.o \
-@COND_TOOLKIT_MSW@     coredll_statline.o coredll_stattext.o coredll_tabctrl.o \
-@COND_TOOLKIT_MSW@     coredll_tbar95.o coredll_textctrl.o coredll_tglbtn.o \
-@COND_TOOLKIT_MSW@     coredll_treectrl.o
+@COND_TOOLKIT_MSW@     coredll_radiobox.o coredll_radiobut.o coredll_renderer.o \
+@COND_TOOLKIT_MSW@     coredll_scrolbar.o coredll_slider95.o coredll_spinbutt.o \
+@COND_TOOLKIT_MSW@     coredll_spinctrl.o coredll_statbmp.o coredll_statbox.o \
+@COND_TOOLKIT_MSW@     coredll_statbr95.o coredll_statline.o coredll_stattext.o \
+@COND_TOOLKIT_MSW@     coredll_tabctrl.o coredll_tbar95.o coredll_textctrl.o \
+@COND_TOOLKIT_MSW@     coredll_tglbtn.o coredll_treectrl.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = coredll_accel.o \
 @COND_TOOLKIT_OS2@     coredll_app.o coredll_bitmap.o coredll_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     coredll_brush.o coredll_button.o coredll_checkbox.o \
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = coredll_accel.o \
 @COND_TOOLKIT_OS2@     coredll_app.o coredll_bitmap.o coredll_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     coredll_brush.o coredll_button.o coredll_checkbox.o \


@@ -1583,11 +1593,11 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_GTK@     corelib_joystick.o corelib_listbox.o corelib_mdi.o \
 @COND_TOOLKIT_GTK@     corelib_menu.o corelib_minifram.o corelib_msgdlg.o \
 @COND_TOOLKIT_GTK@     corelib_notebook.o corelib_radiobox.o corelib_radiobut.o \
 @COND_TOOLKIT_GTK@     corelib_joystick.o corelib_listbox.o corelib_mdi.o \
 @COND_TOOLKIT_GTK@     corelib_menu.o corelib_minifram.o corelib_msgdlg.o \
 @COND_TOOLKIT_GTK@     corelib_notebook.o corelib_radiobox.o corelib_radiobut.o \

-@COND_TOOLKIT_GTK@     corelib_scrolbar.o corelib_scrolwin.o corelib_slider.o \
-@COND_TOOLKIT_GTK@     corelib_spinbutt.o corelib_spinctrl.o corelib_statbmp.o \
-@COND_TOOLKIT_GTK@     corelib_statbox.o corelib_statline.o corelib_stattext.o \
-@COND_TOOLKIT_GTK@     corelib_tbargtk.o corelib_textctrl.o corelib_tglbtn.o \
-@COND_TOOLKIT_GTK@     corelib_utilsres.o corelib_wave.o
+@COND_TOOLKIT_GTK@     corelib_renderer.o corelib_scrolbar.o corelib_scrolwin.o \
+@COND_TOOLKIT_GTK@     corelib_slider.o corelib_spinbutt.o corelib_spinctrl.o \
+@COND_TOOLKIT_GTK@     corelib_statbmp.o corelib_statbox.o corelib_statline.o \
+@COND_TOOLKIT_GTK@     corelib_stattext.o corelib_tbargtk.o corelib_textctrl.o \
+@COND_TOOLKIT_GTK@     corelib_tglbtn.o corelib_utilsres.o corelib_wave.o

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = corelib_accel.o \
 @COND_TOOLKIT_MAC@     corelib_aga.o corelib_app.o corelib_bitmap.o \
 @COND_TOOLKIT_MAC@     corelib_bmpbuttn.o corelib_brush.o corelib_button.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = corelib_accel.o \
 @COND_TOOLKIT_MAC@     corelib_aga.o corelib_app.o corelib_bitmap.o \
 @COND_TOOLKIT_MAC@     corelib_bmpbuttn.o corelib_brush.o corelib_button.o \


@@ -1606,16 +1616,17 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MAC@     corelib_msgdlg.o corelib_notebmac.o corelib_palette.o \
 @COND_TOOLKIT_MAC@     corelib_pen.o corelib_pnghand.o corelib_printdlg.o \
 @COND_TOOLKIT_MAC@     corelib_printmac.o corelib_radiobox.o corelib_radiobut.o \
 @COND_TOOLKIT_MAC@     corelib_msgdlg.o corelib_notebmac.o corelib_palette.o \
 @COND_TOOLKIT_MAC@     corelib_pen.o corelib_pnghand.o corelib_printdlg.o \
 @COND_TOOLKIT_MAC@     corelib_printmac.o corelib_radiobox.o corelib_radiobut.o \

-@COND_TOOLKIT_MAC@     corelib_region.o corelib_scrolbar.o corelib_settings.o \
-@COND_TOOLKIT_MAC@     corelib_slider.o corelib_spinbutt.o corelib_statbmp.o \
-@COND_TOOLKIT_MAC@     corelib_statbox.o corelib_statbrma.o corelib_statlmac.o \
-@COND_TOOLKIT_MAC@     corelib_stattext.o corelib_tabctrl.o corelib_textctrl.o \
-@COND_TOOLKIT_MAC@     corelib_thread.o corelib_timer.o corelib_toplevel.o \
-@COND_TOOLKIT_MAC@     corelib_toolbar.o corelib_tooltip.o corelib_uma.o \
-@COND_TOOLKIT_MAC@     corelib_wave.o corelib_window.o corelib_MoreFilesX.o \
-@COND_TOOLKIT_MAC@     corelib_statusbr.o corelib_imaglist.o corelib_listctrl.o \
-@COND_TOOLKIT_MAC@     corelib_fdrepdlg.o corelib_tabg.o corelib_fontdlgg.o \
-@COND_TOOLKIT_MAC@     corelib_caret.o corelib_snglinst.o
+@COND_TOOLKIT_MAC@     corelib_region.o corelib_renderer.o corelib_scrolbar.o \
+@COND_TOOLKIT_MAC@     corelib_settings.o corelib_slider.o corelib_spinbutt.o \
+@COND_TOOLKIT_MAC@     corelib_statbmp.o corelib_statbox.o corelib_statbrma.o \
+@COND_TOOLKIT_MAC@     corelib_statlmac.o corelib_stattext.o corelib_tabctrl.o \
+@COND_TOOLKIT_MAC@     corelib_textctrl.o corelib_thread.o corelib_timer.o \
+@COND_TOOLKIT_MAC@     corelib_toplevel.o corelib_toolbar.o corelib_tooltip.o \
+@COND_TOOLKIT_MAC@     corelib_uma.o corelib_wave.o corelib_window.o \
+@COND_TOOLKIT_MAC@     corelib_MoreFilesX.o corelib_statusbr.o \
+@COND_TOOLKIT_MAC@     corelib_imaglist.o corelib_listctrl.o corelib_fdrepdlg.o \
+@COND_TOOLKIT_MAC@     corelib_tabg.o corelib_fontdlgg.o corelib_caret.o \
+@COND_TOOLKIT_MAC@     corelib_snglinst.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = \
 @COND_TOOLKIT_MOTIF@   corelib_gsockmot.o corelib_accel.o corelib_app.o \
 @COND_TOOLKIT_MOTIF@   corelib_bmpbuttn.o corelib_bmpmotif.o corelib_button.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = \
 @COND_TOOLKIT_MOTIF@   corelib_gsockmot.o corelib_accel.o corelib_app.o \
 @COND_TOOLKIT_MOTIF@   corelib_bmpbuttn.o corelib_bmpmotif.o corelib_button.o \


@@ -1652,12 +1663,12 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MSW@     corelib_menuitem.o corelib_metafile.o corelib_msgdlg.o \
 @COND_TOOLKIT_MSW@     corelib_nativdlg.o corelib_notebook.o corelib_ownerdrw.o \
 @COND_TOOLKIT_MSW@     corelib_penwin.o corelib_printdlg.o corelib_printwin.o \
 @COND_TOOLKIT_MSW@     corelib_menuitem.o corelib_metafile.o corelib_msgdlg.o \
 @COND_TOOLKIT_MSW@     corelib_nativdlg.o corelib_notebook.o corelib_ownerdrw.o \
 @COND_TOOLKIT_MSW@     corelib_penwin.o corelib_printdlg.o corelib_printwin.o \

-@COND_TOOLKIT_MSW@     corelib_radiobox.o corelib_radiobut.o corelib_scrolbar.o \
-@COND_TOOLKIT_MSW@     corelib_slider95.o corelib_spinbutt.o corelib_spinctrl.o \
-@COND_TOOLKIT_MSW@     corelib_statbmp.o corelib_statbox.o corelib_statbr95.o \
-@COND_TOOLKIT_MSW@     corelib_statline.o corelib_stattext.o corelib_tabctrl.o \
-@COND_TOOLKIT_MSW@     corelib_tbar95.o corelib_textctrl.o corelib_tglbtn.o \
-@COND_TOOLKIT_MSW@     corelib_treectrl.o
+@COND_TOOLKIT_MSW@     corelib_radiobox.o corelib_radiobut.o corelib_renderer.o \
+@COND_TOOLKIT_MSW@     corelib_scrolbar.o corelib_slider95.o corelib_spinbutt.o \
+@COND_TOOLKIT_MSW@     corelib_spinctrl.o corelib_statbmp.o corelib_statbox.o \
+@COND_TOOLKIT_MSW@     corelib_statbr95.o corelib_statline.o corelib_stattext.o \
+@COND_TOOLKIT_MSW@     corelib_tabctrl.o corelib_tbar95.o corelib_textctrl.o \
+@COND_TOOLKIT_MSW@     corelib_tglbtn.o corelib_treectrl.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = corelib_accel.o \
 @COND_TOOLKIT_OS2@     corelib_app.o corelib_bitmap.o corelib_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     corelib_brush.o corelib_button.o corelib_checkbox.o \
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = corelib_accel.o \
 @COND_TOOLKIT_OS2@     corelib_app.o corelib_bitmap.o corelib_bmpbuttn.o \
 @COND_TOOLKIT_OS2@     corelib_brush.o corelib_button.o corelib_checkbox.o \


@@ -4481,8 +4492,20 @@ coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/mac/region.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/mac/region.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-coredll_renderer.o: $(srcdir)/src/univ/renderer.cpp
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/mac/renderer.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/gtk/renderer.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_renderer.o: $(srcdir)/src/univ/renderer.cpp
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<


@@ -6607,8 +6630,20 @@ corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/mac/region.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/mac/region.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-corelib_renderer.o: $(srcdir)/src/univ/renderer.cpp
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/mac/renderer.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/gtk/renderer.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_renderer.o: $(srcdir)/src/univ/renderer.cpp
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@corelib_renderg.o: $(srcdir)/src/generic/renderg.cpp
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<


@@ -9292,8 +9327,20 @@ monodll_regex.o: $(srcdir)/src/common/regex.cpp
 monodll_registry.o: $(srcdir)/src/msw/registry.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_registry.o: $(srcdir)/src/msw/registry.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-monodll_renderer.o: $(srcdir)/src/univ/renderer.cpp
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/mac/renderer.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/gtk/renderer.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_renderer.o: $(srcdir)/src/univ/renderer.cpp
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -11781,8 +11828,20 @@ monolib_regex.o: $(srcdir)/src/common/regex.cpp
 monolib_registry.o: $(srcdir)/src/msw/registry.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_registry.o: $(srcdir)/src/msw/registry.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-monolib_renderer.o: $(srcdir)/src/univ/renderer.cpp
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/mac/renderer.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/gtk/renderer.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_renderer.o: $(srcdir)/src/univ/renderer.cpp
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<