fixed completely broken CheckForTransparency()

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 29e60802eaf0be2013e82e225431f6515dd87348..5876829e2cdc9841ea18a849dcb48e5ea748f003 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,7 @@ DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@

+EXTRALIBS_XML = @EXTRALIBS_XML@

 HOST_SUFFIX = @HOST_SUFFIX@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
 HOST_SUFFIX = @HOST_SUFFIX@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@


@@ -51,68 +52,83 @@ top_srcdir = @top_srcdir@
 
 BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 
 BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL_BASE \
-       -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) $(PIC_FLAG)

 BASEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 BASEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXMAKINGDLL_BASE \
-       -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG)

 BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 \
-       -DwxUSE_GUI=0 $(CFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)

 BASELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 BASELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 \
-       -DwxUSE_GUI=0 $(CXXFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)

 COREDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 COREDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXUSINGDLL \
-       -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG)

 COREDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 COREDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXUSINGDLL \
-       -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG)

 CORELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 CORELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=0 $(CFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=0 $(CFLAGS)

 CORELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 CORELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=0 $(CXXFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=0 $(CXXFLAGS)

 GLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 GLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXUSINGDLL \
-       -DWXMAKINGDLL_GL $(CXXFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS) $(PIC_FLAG)

 GLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 GLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(CXXFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXFLAGS)

 HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXUSINGDLL \
-       -DWXMAKINGDLL_HTML $(CXXFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS) $(PIC_FLAG)

 HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(CXXFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXFLAGS)

 MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 \
-       -DWXMAKINGDLL $(CFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) $(PIC_FLAG)

 MONODLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 MONODLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 \
-       -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG)

 MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 $(CFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 $(CFLAGS)

 MONOLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 MONOLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \

-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 $(CXXFLAGS)
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 $(CXXFLAGS)
+WXEXPAT_CFLAGS = $(CPPFLAGS)   -I./src/expat $(CFLAGS)

 WXJPEG_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXODBC_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXPNG_CFLAGS = $(CPPFLAGS)   $(__INC_ZLIB_p) $(CFLAGS)
 WXREGEX_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXTIFF_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXJPEG_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXODBC_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXPNG_CFLAGS = $(CPPFLAGS)   $(__INC_ZLIB_p) $(CFLAGS)
 WXREGEX_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXTIFF_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)

+XMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG)
+XMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXFLAGS)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -126,46 +142,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 +203,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 \


@@ -417,7 +433,19 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MSW@     wx/msw/ole/dataobj.h wx/msw/ole/dataobj2.h \
 @COND_TOOLKIT_MSW@     wx/msw/ole/dropsrc.h wx/msw/ole/droptgt.h \
 @COND_TOOLKIT_MSW@     wx/msw/ole/oleutils.h wx/msw/ole/uuid.h \
 @COND_TOOLKIT_MSW@     wx/msw/ole/dataobj.h wx/msw/ole/dataobj2.h \
 @COND_TOOLKIT_MSW@     wx/msw/ole/dropsrc.h wx/msw/ole/droptgt.h \
 @COND_TOOLKIT_MSW@     wx/msw/ole/oleutils.h wx/msw/ole/uuid.h \

-@COND_TOOLKIT_MSW@     wx/msw/helpbest.h
+@COND_TOOLKIT_MSW@     wx/msw/helpbest.h wx/msw/wx.rc wx/msw/wx.manifest \
+@COND_TOOLKIT_MSW@     wx/msw/gnuwin32/winresrc.h wx/msw/colours.bmp \
+@COND_TOOLKIT_MSW@     wx/msw/csquery.bmp wx/msw/disable.bmp wx/msw/blank.cur \
+@COND_TOOLKIT_MSW@     wx/msw/bullseye.cur wx/msw/clock.cur wx/msw/hand.cur \
+@COND_TOOLKIT_MSW@     wx/msw/heart.cur wx/msw/magnif1.cur wx/msw/noentry.cur \
+@COND_TOOLKIT_MSW@     wx/msw/pbrush.cur wx/msw/pencil.cur wx/msw/pntleft.cur \
+@COND_TOOLKIT_MSW@     wx/msw/pntright.cur wx/msw/query.cur wx/msw/rightarr.cur \
+@COND_TOOLKIT_MSW@     wx/msw/roller.cur wx/msw/size.cur wx/msw/watch1.cur \
+@COND_TOOLKIT_MSW@     wx/msw/cdrom.ico wx/msw/child.ico wx/msw/computer.ico \
+@COND_TOOLKIT_MSW@     wx/msw/drive.ico wx/msw/error.ico wx/msw/file1.ico \
+@COND_TOOLKIT_MSW@     wx/msw/floppy.ico wx/msw/folder1.ico wx/msw/folder2.ico \
+@COND_TOOLKIT_MSW@     wx/msw/info.ico wx/msw/mdi.ico wx/msw/question.ico \
+@COND_TOOLKIT_MSW@     wx/msw/removble.ico wx/msw/std.ico wx/msw/warning.ico

 @COND_TOOLKIT_OS2@GUI_HDR = wx/os2/accel.h wx/os2/dataobj.h \
 @COND_TOOLKIT_OS2@     wx/os2/helpwin.h wx/os2/pngread.h wx/os2/statline.h \
 @COND_TOOLKIT_OS2@     wx/os2/app.h wx/os2/dataobj2.h wx/os2/icon.h \
 @COND_TOOLKIT_OS2@GUI_HDR = wx/os2/accel.h wx/os2/dataobj.h \
 @COND_TOOLKIT_OS2@     wx/os2/helpwin.h wx/os2/pngread.h wx/os2/statline.h \
 @COND_TOOLKIT_OS2@     wx/os2/app.h wx/os2/dataobj2.h wx/os2/icon.h \


@@ -629,56 +657,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 +732,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 +861,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 +990,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 +1119,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 +1207,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 +1230,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 +1277,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 +1345,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 +1368,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 +1415,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 +1483,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 +1506,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 +1553,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 +1621,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 +1644,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 +1691,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 \


@@ -1687,12 +1726,15 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o

+@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib

 @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
 @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
 @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
 @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
 @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
 @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
 @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
 @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
 @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
 @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
 @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib

+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)

 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \
 @COND_WXUSE_LIBJPEG_BUILTIN@   -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \
 @COND_WXUSE_LIBJPEG_BUILTIN@   -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \


@@ -2023,8 +2065,6 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_MONOLITHIC_0_SHARED_1@   = \
 @COND_MONOLITHIC_0_SHARED_1@   $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__basedll___importlib = \
 @COND_MONOLITHIC_0_SHARED_1@   = \
 @COND_MONOLITHIC_0_SHARED_1@   $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__basedll___importlib = \

-@COND_PLATFORM_WIN32_1@        -Wl,--out-implib,libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-@COND_PLATFORM_WIN32_1@__basedll___importlib = \

 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__basedll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \
 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__basedll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \


@@ -2061,8 +2101,6 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = \
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__coredll___importlib = \
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = \
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__coredll___importlib = \

-@COND_PLATFORM_WIN32_1@        -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-@COND_PLATFORM_WIN32_1@__coredll___importlib = \

 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__coredll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \
 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__coredll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \


@@ -2099,8 +2137,6 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = \
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__gldll___importlib = \
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = \
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__gldll___importlib = \

-@COND_PLATFORM_WIN32_1@        -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-@COND_PLATFORM_WIN32_1@__gldll___importlib = \

 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = \
 @COND_PLATFORM_MACOSX_1@       -install_name \
 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = \
 @COND_PLATFORM_MACOSX_1@       -install_name \


@@ -2136,8 +2172,6 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        = \
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__htmldll___importlib = \
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        = \
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__htmldll___importlib = \

-@COND_PLATFORM_WIN32_1@        -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-@COND_PLATFORM_WIN32_1@__htmldll___importlib = \

 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \
 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \


@@ -2188,20 +2222,21 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        = install_htmllib
 @COND_MONOLITHIC_1_SHARED_1@__install_monodll___depname = install_monodll
 @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        = install_htmllib
 @COND_MONOLITHIC_1_SHARED_1@__install_monodll___depname = install_monodll
 @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib

+@COND_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname = install_wxexpat

 @COND_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname = install_wxjpeg
 @COND_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname = install_wxodbc
 @COND_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname = install_wxpng
 @COND_WXUSE_REGEX_BUILTIN@__install_wxregex___depname = install_wxregex
 @COND_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname = install_wxtiff
 @COND_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname = install_wxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname = install_wxjpeg
 @COND_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname = install_wxodbc
 @COND_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname = install_wxpng
 @COND_WXUSE_REGEX_BUILTIN@__install_wxregex___depname = install_wxregex
 @COND_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname = install_wxtiff
 @COND_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname = install_wxzlib

+@COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
+@COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib

 @COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
 @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
 @COND_MONOLITHIC_1_SHARED_1@__monodll___depname \
 @COND_MONOLITHIC_1_SHARED_1@   = \
 @COND_MONOLITHIC_1_SHARED_1@   $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__monodll___importlib = \
 @COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
 @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
 @COND_MONOLITHIC_1_SHARED_1@__monodll___depname \
 @COND_MONOLITHIC_1_SHARED_1@   = \
 @COND_MONOLITHIC_1_SHARED_1@   $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_PLATFORM_WIN32_1@__monodll___importlib = \

-@COND_PLATFORM_WIN32_1@        -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-@COND_PLATFORM_WIN32_1@__monodll___importlib = \

 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__monodll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \
 @COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_PLATFORM_MACOSX_1@__monodll___macinstnamecmd \
 @COND_PLATFORM_MACOSX_1@       = -install_name \


@@ -2234,6 +2269,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_MONOLITHIC_1_SHARED_0@__monolib___depname \
 @COND_MONOLITHIC_1_SHARED_0@   = \
 @COND_MONOLITHIC_1_SHARED_0@   $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_1_SHARED_0@__monolib___depname \
 @COND_MONOLITHIC_1_SHARED_0@   = \
 @COND_MONOLITHIC_1_SHARED_0@   $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a

+@COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = \
+@COND_WXUSE_EXPAT_BUILTIN@     $(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a

 @COND_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname \
 @COND_WXUSE_LIBJPEG_BUILTIN@   = \
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a
 @COND_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname \
 @COND_WXUSE_LIBJPEG_BUILTIN@   = \
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a


@@ -2248,6 +2285,41 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_WXUSE_LIBTIFF_BUILTIN@   $(top_builddir)lib/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a
 @COND_WXUSE_ZLIB_BUILTIN@__wxzlib___depname = \
 @COND_WXUSE_ZLIB_BUILTIN@      $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a
 @COND_WXUSE_LIBTIFF_BUILTIN@   $(top_builddir)lib/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a
 @COND_WXUSE_ZLIB_BUILTIN@__wxzlib___depname = \
 @COND_WXUSE_ZLIB_BUILTIN@      $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a

+@COND_MONOLITHIC_0_SHARED_1@__xmldll___depname \
+@COND_MONOLITHIC_0_SHARED_1@   = \
+@COND_MONOLITHIC_0_SHARED_1@   $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_PLATFORM_WIN32_1@__xmldll___importlib = \
+@COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_PLATFORM_MACOSX_1@__xmldll___macinstnamecmd = \
+@COND_PLATFORM_MACOSX_1@       -install_name \
+@COND_PLATFORM_MACOSX_1@       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_cmd = \
+@COND_USE_SOSYMLINKS_1@        rm -f \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd \
+@COND_USE_SOSYMLINKS_1@        = rm -f \
+@COND_USE_SOSYMLINKS_1@        libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+@COND_USE_SOSYMLINKS_1@        libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_USE_SOVERLINUX_1@__xmldll___soname_flags = \
+@COND_USE_SOVERLINUX_1@        $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERSOLARIS_1@__xmldll___soname_flags = \
+@COND_USE_SOVERSOLARIS_1@      $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_0@__xmllib___depname \
+@COND_MONOLITHIC_0_SHARED_0@   = \
+@COND_MONOLITHIC_0_SHARED_0@   $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a

 @COND_PLATFORM_MACOSX_1@dll___macver = \
 @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.5 -current_version 2.5.0
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_PLATFORM_MACOSX_1@dll___macver = \
 @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.5 -current_version 2.5.0
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0


@@ -2261,10 +2333,10 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname)
+all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname)

 
 @COND_MONOLITHIC_0_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxzlib___depname) $(__wxregex___depname) basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2)
 
 @COND_MONOLITHIC_0_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxzlib___depname) $(__wxregex___depname) basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2)

-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@  basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) $(LDFLAGS) $(__basedll___importlib)   -L$(top_builddir)lib $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@  basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) $(LDFLAGS)   -L$(top_builddir)lib $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)

 @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
 
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp
 @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
 
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp


@@ -2929,6 +3001,7 @@ clean:
        rm -f $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a

+       rm -f $(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a

        rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)


@@ -2945,14 +3018,18 @@ clean:
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a

+       rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       rm -f $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+       rm -f $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+       rm -f $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a

        rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
        rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
 
        rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
        rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
 

-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@  coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(LDFLAGS) $(__coredll___importlib)   -L$(top_builddir)lib $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@  coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(LDFLAGS)   -L$(top_builddir)lib $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)

 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
 
 coredll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
 
 coredll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c


@@ -4491,8 +4568,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) $<


@@ -6617,8 +6706,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) $<


@@ -7206,8 +7307,8 @@ distclean: clean
        rm -f configure config.cache config.log config.status
        rm -f bk-deps shared-ld-sh
 
        rm -f configure config.cache config.log config.status
        rm -f bk-deps shared-ld-sh
 

-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__OPENGL_SRC_OBJECTS)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@  $(__OPENGL_SRC_OBJECTS) $(LDFLAGS) $(__gldll___importlib)   -L$(top_builddir)lib $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__OPENGL_SRC_OBJECTS)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@  $(__OPENGL_SRC_OBJECTS) $(LDFLAGS)   -L$(top_builddir)lib $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)

 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 
 @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 
 @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp


@@ -7245,8 +7346,8 @@ distclean: clean
 @COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
 @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
 @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 

-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@  $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(LDFLAGS) $(__htmldll___importlib)   -L$(top_builddir)lib $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@  $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(LDFLAGS)   -L$(top_builddir)lib $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)

 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
 
 htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
 
 htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp


@@ -7386,13 +7487,13 @@ htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp
 htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp
        $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
 
 htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp
        $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
 

-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname)
+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname)

        $(INSTALL_DIR) $(datadir)/aclocal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(datadir)/aclocal)
        $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
        (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
        $(INSTALL_DIR) $(includedir)
        $(INSTALL_DIR) $(datadir)/aclocal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(datadir)/aclocal)
        $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
        (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
        $(INSTALL_DIR) $(includedir)

-       for f in wx/apptrait.h wx/beforestd.h wx/containr.h wx/msgout.h wx/types.h wx/init.h wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_inet.h wx/fs_zip.h wx/fs_mem.h wx/gsocket.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/url.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h wx/protocol/protocol.h wx/protocol/http.h $(BASE_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/wxhtml.h wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/htmllbox.h $(OPENGL_HDR); do \
+       for f in wx/apptrait.h wx/beforestd.h wx/containr.h wx/msgout.h wx/types.h wx/init.h wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_inet.h wx/fs_zip.h wx/fs_mem.h wx/gsocket.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/url.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h wx/protocol/protocol.h wx/protocol/http.h $(BASE_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/wxhtml.h wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \

        if test ! -d $(includedir)/`dirname $$f` ; then \
        $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
        fi; \
        if test ! -d $(includedir)/`dirname $$f` ; then \
        $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
        fi; \


@@ -7412,6 +7513,7 @@ install-strip: install
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)

+       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)

        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 
 install-wxconfig: 
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 
 install-wxconfig: 


@@ -7469,6 +7571,10 @@ install-wxconfig:
 @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(libdir)
 @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir)
 
 @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(libdir)
 @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir)
 

+@COND_WXUSE_EXPAT_BUILTIN@install_wxexpat: 
+@COND_WXUSE_EXPAT_BUILTIN@     $(INSTALL_DIR) $(libdir)
+@COND_WXUSE_EXPAT_BUILTIN@     $(INSTALL_DATA) $(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+

 @COND_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: 
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(INSTALL_DIR) $(libdir)
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(INSTALL_DATA) $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 @COND_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: 
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(INSTALL_DIR) $(libdir)
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(INSTALL_DATA) $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)


@@ -7493,6 +7599,16 @@ install-wxconfig:
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DIR) $(libdir)
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DATA) $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DIR) $(libdir)
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DATA) $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 

+@COND_MONOLITHIC_0_SHARED_1@install_xmldll: 
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
+
+@COND_MONOLITHIC_0_SHARED_0@install_xmllib: 
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(libdir)
+

 @COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).0.r: 
 @COND_TOOLKIT_MAC@     $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
 @COND_TOOLKIT_MAC@     $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r
 @COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).0.r: 
 @COND_TOOLKIT_MAC@     $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
 @COND_TOOLKIT_MAC@     $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r


@@ -7501,8 +7617,8 @@ install-wxconfig:
 @COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
 @COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir)
 
 @COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
 @COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir)
 

-@COND_MONOLITHIC_1_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS)
-@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@  monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) $(LDFLAGS) $(__monodll___importlib)   -L$(top_builddir)lib $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) monodll_xml.o
+@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@  monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) monodll_xml.o $(LDFLAGS)   -L$(top_builddir)lib $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML)

 @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
 
 monodll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
 @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
 
 monodll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c


@@ -9302,8 +9418,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) $<


@@ -9980,6 +10108,9 @@ monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp
 monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+monodll_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9989,9 +10120,9 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp
 monodll_zstream.o: $(srcdir)/src/common/zstream.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_zstream.o: $(srcdir)/src/common/zstream.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_MONOLITHIC_1_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1)
+@COND_MONOLITHIC_1_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) monolib_xml.o

 @COND_MONOLITHIC_1_SHARED_0@   rm -f $@
 @COND_MONOLITHIC_1_SHARED_0@   rm -f $@

-@COND_MONOLITHIC_1_SHARED_0@   $(AR) rcu $@  monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1)
+@COND_MONOLITHIC_1_SHARED_0@   $(AR) rcu $@  monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) monolib_xml.o

 @COND_MONOLITHIC_1_SHARED_0@   $(RANLIB) $@
 
 monolib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
 @COND_MONOLITHIC_1_SHARED_0@   $(RANLIB) $@
 
 monolib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c


@@ -11791,8 +11922,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) $<


@@ -12469,6 +12612,9 @@ monolib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp
 monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+monolib_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -12480,6 +12626,20 @@ monolib_zstream.o: $(srcdir)/src/common/zstream.cpp
 
 uninstall: 
 
 
 uninstall: 
 

+@COND_WXUSE_EXPAT_BUILTIN@$(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: wxexpat_xmlparse.o wxexpat_xmlrole.o wxexpat_xmltok.o
+@COND_WXUSE_EXPAT_BUILTIN@     rm -f $@
+@COND_WXUSE_EXPAT_BUILTIN@     $(AR) rcu $@  wxexpat_xmlparse.o wxexpat_xmlrole.o wxexpat_xmltok.o
+@COND_WXUSE_EXPAT_BUILTIN@     $(RANLIB) $@
+
+wxexpat_xmlparse.o: $(srcdir)/src/expat/lib/xmlparse.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $<
+
+wxexpat_xmlrole.o: $(srcdir)/src/expat/lib/xmlrole.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $<
+
+wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $<
+

 @COND_WXUSE_LIBJPEG_BUILTIN@$(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a: wxjpeg_jcomapi.o wxjpeg_jutils.o wxjpeg_jerror.o wxjpeg_jmemmgr.o wxjpeg_jmemnobs.o wxjpeg_jcapimin.o wxjpeg_jcapistd.o wxjpeg_jctrans.o wxjpeg_jcparam.o wxjpeg_jdatadst.o wxjpeg_jcinit.o wxjpeg_jcmaster.o wxjpeg_jcmarker.o wxjpeg_jcmainct.o wxjpeg_jcprepct.o wxjpeg_jccoefct.o wxjpeg_jccolor.o wxjpeg_jcsample.o wxjpeg_jchuff.o wxjpeg_jcphuff.o wxjpeg_jcdctmgr.o wxjpeg_jfdctfst.o wxjpeg_jfdctflt.o wxjpeg_jfdctint.o wxjpeg_jdapimin.o wxjpeg_jdapistd.o wxjpeg_jdtrans.o wxjpeg_jdatasrc.o wxjpeg_jdmaster.o wxjpeg_jdinput.o wxjpeg_jdmarker.o wxjpeg_jdhuff.o wxjpeg_jdphuff.o wxjpeg_jdmainct.o wxjpeg_jdcoefct.o wxjpeg_jdpostct.o wxjpeg_jddctmgr.o wxjpeg_jidctfst.o wxjpeg_jidctflt.o wxjpeg_jidctint.o wxjpeg_jidctred.o wxjpeg_jdsample.o wxjpeg_jdcolor.o wxjpeg_jquant1.o wxjpeg_jquant2.o wxjpeg_jdmerge.o
 @COND_WXUSE_LIBJPEG_BUILTIN@   rm -f $@
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(AR) rcu $@  wxjpeg_jcomapi.o wxjpeg_jutils.o wxjpeg_jerror.o wxjpeg_jmemmgr.o wxjpeg_jmemnobs.o wxjpeg_jcapimin.o wxjpeg_jcapistd.o wxjpeg_jctrans.o wxjpeg_jcparam.o wxjpeg_jdatadst.o wxjpeg_jcinit.o wxjpeg_jcmaster.o wxjpeg_jcmarker.o wxjpeg_jcmainct.o wxjpeg_jcprepct.o wxjpeg_jccoefct.o wxjpeg_jccolor.o wxjpeg_jcsample.o wxjpeg_jchuff.o wxjpeg_jcphuff.o wxjpeg_jcdctmgr.o wxjpeg_jfdctfst.o wxjpeg_jfdctflt.o wxjpeg_jfdctint.o wxjpeg_jdapimin.o wxjpeg_jdapistd.o wxjpeg_jdtrans.o wxjpeg_jdatasrc.o wxjpeg_jdmaster.o wxjpeg_jdinput.o wxjpeg_jdmarker.o wxjpeg_jdhuff.o wxjpeg_jdphuff.o wxjpeg_jdmainct.o wxjpeg_jdcoefct.o wxjpeg_jdpostct.o wxjpeg_jddctmgr.o wxjpeg_jidctfst.o wxjpeg_jidctflt.o wxjpeg_jidctint.o wxjpeg_jidctred.o wxjpeg_jdsample.o wxjpeg_jdcolor.o wxjpeg_jquant1.o wxjpeg_jquant2.o wxjpeg_jdmerge.o
 @COND_WXUSE_LIBJPEG_BUILTIN@$(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a: wxjpeg_jcomapi.o wxjpeg_jutils.o wxjpeg_jerror.o wxjpeg_jmemmgr.o wxjpeg_jmemnobs.o wxjpeg_jcapimin.o wxjpeg_jcapistd.o wxjpeg_jctrans.o wxjpeg_jcparam.o wxjpeg_jdatadst.o wxjpeg_jcinit.o wxjpeg_jcmaster.o wxjpeg_jcmarker.o wxjpeg_jcmainct.o wxjpeg_jcprepct.o wxjpeg_jccoefct.o wxjpeg_jccolor.o wxjpeg_jcsample.o wxjpeg_jchuff.o wxjpeg_jcphuff.o wxjpeg_jcdctmgr.o wxjpeg_jfdctfst.o wxjpeg_jfdctflt.o wxjpeg_jfdctint.o wxjpeg_jdapimin.o wxjpeg_jdapistd.o wxjpeg_jdtrans.o wxjpeg_jdatasrc.o wxjpeg_jdmaster.o wxjpeg_jdinput.o wxjpeg_jdmarker.o wxjpeg_jdhuff.o wxjpeg_jdphuff.o wxjpeg_jdmainct.o wxjpeg_jdcoefct.o wxjpeg_jdpostct.o wxjpeg_jddctmgr.o wxjpeg_jidctfst.o wxjpeg_jidctflt.o wxjpeg_jidctint.o wxjpeg_jidctred.o wxjpeg_jdsample.o wxjpeg_jdcolor.o wxjpeg_jquant1.o wxjpeg_jquant2.o wxjpeg_jdmerge.o
 @COND_WXUSE_LIBJPEG_BUILTIN@   rm -f $@
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(AR) rcu $@  wxjpeg_jcomapi.o wxjpeg_jutils.o wxjpeg_jerror.o wxjpeg_jmemmgr.o wxjpeg_jmemnobs.o wxjpeg_jcapimin.o wxjpeg_jcapistd.o wxjpeg_jctrans.o wxjpeg_jcparam.o wxjpeg_jdatadst.o wxjpeg_jcinit.o wxjpeg_jcmaster.o wxjpeg_jcmarker.o wxjpeg_jcmainct.o wxjpeg_jcprepct.o wxjpeg_jccoefct.o wxjpeg_jccolor.o wxjpeg_jcsample.o wxjpeg_jchuff.o wxjpeg_jcphuff.o wxjpeg_jcdctmgr.o wxjpeg_jfdctfst.o wxjpeg_jfdctflt.o wxjpeg_jfdctint.o wxjpeg_jdapimin.o wxjpeg_jdapistd.o wxjpeg_jdtrans.o wxjpeg_jdatasrc.o wxjpeg_jdmaster.o wxjpeg_jdinput.o wxjpeg_jdmarker.o wxjpeg_jdhuff.o wxjpeg_jdphuff.o wxjpeg_jdmainct.o wxjpeg_jdcoefct.o wxjpeg_jdpostct.o wxjpeg_jddctmgr.o wxjpeg_jidctfst.o wxjpeg_jidctflt.o wxjpeg_jidctint.o wxjpeg_jidctred.o wxjpeg_jdsample.o wxjpeg_jdcolor.o wxjpeg_jquant1.o wxjpeg_jquant2.o wxjpeg_jdmerge.o


@@ -12903,8 +13063,23 @@ wxzlib_uncompr.o: $(srcdir)/src/zlib/uncompr.c
 wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c
        $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
 
 wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c
        $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
 

+@COND_MONOLITHIC_0_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxzlib___depname) $(__wxregex___depname) xmldll_xml.o $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@  xmldll_xml.o $(LDFLAGS)   -L$(top_builddir)lib $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
+
+xmldll_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $<
+
+@COND_MONOLITHIC_0_SHARED_0@$(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: xmllib_xml.o
+@COND_MONOLITHIC_0_SHARED_0@   rm -f $@
+@COND_MONOLITHIC_0_SHARED_0@   $(AR) rcu $@  xmllib_xml.o
+@COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
+
+xmllib_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $<
+

 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

-.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib uninstall
+.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall