From 355debca0650f70aa8ed4803b2ebc45541e03d9f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 May 2006 14:09:40 +0000
Subject: [PATCH] added wxPowerEvent; moved power functions stubs to
 common/powercmn.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in                |  19 ++
 autoconf_inc.m4            | 110 ++++-----
 build/bakefiles/files.bkl  |   2 +
 build/msw/makefile.bcc     | 124 +++++++---
 build/msw/makefile.gcc     | 140 ++++++++---
 build/msw/makefile.vc      | 124 +++++++---
 build/msw/makefile.wat     | 140 ++++++++---
 build/msw/wx_adv.dsp       |   8 -
 build/msw/wx_base.dsp      |   8 +
 build/msw/wx_core.dsp      |  67 ++++++
 docs/changes.txt           |   1 +
 docs/latex/wx/classes.tex  |   1 +
 docs/latex/wx/powerevt.tex |  67 ++++++
 include/wx/event.h         |   4 +-
 include/wx/msw/window.h    |   3 +
 include/wx/power.h         | 108 +++++++++
 include/wx/utils.h         |  20 --
 samples/power/Makefile.in  | 190 +++++++++++++++
 samples/power/makefile.bcc | 225 +++++++++++++++++
 samples/power/makefile.gcc | 223 +++++++++++++++++
 samples/power/makefile.vc  | 300 +++++++++++++++++++++++
 samples/power/makefile.wat | 253 +++++++++++++++++++
 samples/power/power.bkl    |  13 +
 samples/power/power.cpp    | 120 ++++++++++
 samples/power/power.dsp    | 480 +++++++++++++++++++++++++++++++++++++
 src/common/powercmn.cpp    |  57 +++++
 src/mac/carbon/utils.cpp   |  12 -
 src/mac/classic/utils.cpp  |  12 -
 src/msw/utils.cpp          |   1 +
 src/msw/window.cpp         |  65 +++++
 src/os2/utils.cpp          |  12 -
 src/palmos/utils.cpp       |   5 +
 src/unix/utilsunx.cpp      |  12 -
 src/wxWindows.dsp          |   8 +
 wxGTK.spec                 |   1 +
 wxMotif.spec               |   1 +
 wxX11.spec                 |   1 +
 37 files changed, 2660 insertions(+), 277 deletions(-)
 create mode 100644 docs/latex/wx/powerevt.tex
 create mode 100644 include/wx/power.h
 create mode 100644 samples/power/Makefile.in
 create mode 100644 samples/power/makefile.bcc
 create mode 100644 samples/power/makefile.gcc
 create mode 100644 samples/power/makefile.vc
 create mode 100644 samples/power/makefile.wat
 create mode 100644 samples/power/power.bkl
 create mode 100644 samples/power/power.cpp
 create mode 100644 samples/power/power.dsp
 create mode 100644 src/common/powercmn.cpp

diff --git a/Makefile.in b/Makefile.in
index d6ccd07e40..a89ba4f8ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -286,6 +286,7 @@ ALL_BASE_HEADERS =  \
 	wx/mstream.h \
 	wx/object.h \
 	wx/platform.h \
+	wx/power.h \
 	wx/process.h \
 	wx/ptr_scpd.h \
 	wx/recguard.h \
@@ -414,6 +415,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/mstream.h \
 	wx/object.h \
 	wx/platform.h \
+	wx/power.h \
 	wx/process.h \
 	wx/ptr_scpd.h \
 	wx/recguard.h \
@@ -546,6 +548,7 @@ ALL_BASE_SOURCES =  \
 	src/common/module.cpp \
 	src/common/mstream.cpp \
 	src/common/object.cpp \
+	src/common/powercmn.cpp \
 	src/common/process.cpp \
 	src/common/regex.cpp \
 	src/common/stdpbase.cpp \
@@ -691,6 +694,7 @@ MONODLL_OBJECTS =  \
 	monodll_module.o \
 	monodll_mstream.o \
 	monodll_object.o \
+	monodll_powercmn.o \
 	monodll_process.o \
 	monodll_regex.o \
 	monodll_stdpbase.o \
@@ -781,6 +785,7 @@ MONOLIB_OBJECTS =  \
 	monolib_module.o \
 	monolib_mstream.o \
 	monolib_object.o \
+	monolib_powercmn.o \
 	monolib_process.o \
 	monolib_regex.o \
 	monolib_stdpbase.o \
@@ -873,6 +878,7 @@ BASEDLL_OBJECTS =  \
 	basedll_module.o \
 	basedll_mstream.o \
 	basedll_object.o \
+	basedll_powercmn.o \
 	basedll_process.o \
 	basedll_regex.o \
 	basedll_stdpbase.o \
@@ -948,6 +954,7 @@ BASELIB_OBJECTS =  \
 	baselib_module.o \
 	baselib_mstream.o \
 	baselib_object.o \
+	baselib_powercmn.o \
 	baselib_process.o \
 	baselib_regex.o \
 	baselib_stdpbase.o \
@@ -11293,6 +11300,9 @@ monodll_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONODLL_ODEP)
 monodll_object.o: $(srcdir)/src/common/object.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
 
+monodll_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
+
 monodll_process.o: $(srcdir)/src/common/process.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/process.cpp
 
@@ -15103,6 +15113,9 @@ monolib_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONOLIB_ODEP)
 monolib_object.o: $(srcdir)/src/common/object.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
 
+monolib_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
+
 monolib_process.o: $(srcdir)/src/common/process.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/process.cpp
 
@@ -18916,6 +18929,9 @@ basedll_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASEDLL_ODEP)
 basedll_object.o: $(srcdir)/src/common/object.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
 
+basedll_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(BASEDLL_ODEP)
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
+
 basedll_process.o: $(srcdir)/src/common/process.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/process.cpp
 
@@ -19471,6 +19487,9 @@ baselib_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASELIB_ODEP)
 baselib_object.o: $(srcdir)/src/common/object.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
 
+baselib_powercmn.o: $(srcdir)/src/common/powercmn.cpp $(BASELIB_ODEP)
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/powercmn.cpp
+
 baselib_process.o: $(srcdir)/src/common/process.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/process.cpp
 
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 8e2b22efb2..c3c04739fc 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,4 +1,4 @@
-dnl ### begin block 00_header[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 00_header[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
 dnl
 dnl This macro was generated by
 dnl Bakefile 0.2.0 (http://bakefile.sourceforge.net)
@@ -8,85 +8,85 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0"
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS
-dnl ### begin block 20_COND_BUILD_DEBUG[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_DEBUG="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_DEBUG=""
     fi
     AC_SUBST(COND_BUILD_DEBUG)
-dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
     if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
         COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
     fi
     AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT)
-dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
     if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
     fi
     AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
-dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_DEBUG_UNICODE_0="#"
     if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
         COND_BUILD_DEBUG_UNICODE_0=""
     fi
     AC_SUBST(COND_BUILD_DEBUG_UNICODE_0)
-dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_DEBUG_UNICODE_1="#"
     if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
         COND_BUILD_DEBUG_UNICODE_1=""
     fi
     AC_SUBST(COND_BUILD_DEBUG_UNICODE_1)
-dnl ### begin block 20_COND_BUILD_RELEASE[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_RELEASE="#"
     if test "x$BUILD" = "xrelease" ; then
         COND_BUILD_RELEASE=""
     fi
     AC_SUBST(COND_BUILD_RELEASE)
-dnl ### begin block 20_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
     if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
     fi
     AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
-dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_RELEASE_UNICODE_0="#"
     if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
         COND_BUILD_RELEASE_UNICODE_0=""
     fi
     AC_SUBST(COND_BUILD_RELEASE_UNICODE_0)
-dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_RELEASE_UNICODE_1="#"
     if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
         COND_BUILD_RELEASE_UNICODE_1=""
     fi
     AC_SUBST(COND_BUILD_RELEASE_UNICODE_1)
-dnl ### begin block 20_COND_DEBUG_FLAG_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_FLAG_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_FLAG_1="#"
     if test "x$DEBUG_FLAG" = "x1" ; then
         COND_DEBUG_FLAG_1=""
     fi
     AC_SUBST(COND_DEBUG_FLAG_1)
-dnl ### begin block 20_COND_DEBUG_INFO_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_0="#"
     if test "x$DEBUG_INFO" = "x0" ; then
         COND_DEBUG_INFO_0=""
     fi
     AC_SUBST(COND_DEBUG_INFO_0)
-dnl ### begin block 20_COND_DEBUG_INFO_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_1="#"
     if test "x$DEBUG_INFO" = "x1" ; then
         COND_DEBUG_INFO_1=""
     fi
     AC_SUBST(COND_DEBUG_INFO_1)
-dnl ### begin block 20_COND_DEPS_TRACKING_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
         COND_DEPS_TRACKING_0=""
     fi
     AC_SUBST(COND_DEPS_TRACKING_0)
-dnl ### begin block 20_COND_DEPS_TRACKING_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_1="#"
     if test "x$DEPS_TRACKING" = "x1" ; then
         COND_DEPS_TRACKING_1=""
@@ -104,7 +104,7 @@ dnl ### begin block 20_COND_ICC_PCH_1[../../contrib/build/animate/animate.bkl,..
         COND_ICC_PCH_1=""
     fi
     AC_SUBST(COND_ICC_PCH_1)
-dnl ### begin block 20_COND_MONOLITHIC_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0="#"
     if test "x$MONOLITHIC" = "x0" ; then
         COND_MONOLITHIC_0=""
@@ -206,19 +206,19 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XRC_1[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_1_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../samples/dialup/dialup.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/splash/splash.bkl,../../samples/widgets/widgets.bkl,../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../samples/dialup/dialup.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/power/power.bkl,../../samples/splash/splash.bkl,../../samples/widgets/widgets.bkl,../../tests/test.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_MEDIA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
         COND_MONOLITHIC_0_USE_MEDIA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_MEDIA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_ODBC_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_ODBC_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_ODBC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
         COND_MONOLITHIC_0_USE_ODBC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_ODBC_1)
-dnl ### begin block 20_COND_MONOLITHIC_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
         COND_MONOLITHIC_1=""
@@ -236,13 +236,13 @@ dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
         COND_MONOLITHIC_1_SHARED_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
     fi
     AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
@@ -260,7 +260,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/buil
         COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_MACOSX_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" ; then
         COND_PLATFORM_MACOSX_1=""
@@ -326,13 +326,13 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[../../contrib/buil
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_MACOS_1="#"
     if test "x$PLATFORM_MACOS" = "x1" ; then
         COND_PLATFORM_MACOS_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOS_1)
-dnl ### begin block 20_COND_PLATFORM_MAC_1[../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MAC_1[../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
     COND_PLATFORM_MAC_1="#"
     if test "x$PLATFORM_MAC" = "x1" ; then
         COND_PLATFORM_MAC_1=""
@@ -344,25 +344,25 @@ dnl ### begin block 20_COND_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ##
         COND_PLATFORM_MSDOS_0=""
     fi
     AC_SUBST(COND_PLATFORM_MSDOS_0)
-dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_MSDOS_1="#"
     if test "x$PLATFORM_MSDOS" = "x1" ; then
         COND_PLATFORM_MSDOS_1=""
     fi
     AC_SUBST(COND_PLATFORM_MSDOS_1)
-dnl ### begin block 20_COND_PLATFORM_OS2_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_OS2_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_OS2_1="#"
     if test "x$PLATFORM_OS2" = "x1" ; then
         COND_PLATFORM_OS2_1=""
     fi
     AC_SUBST(COND_PLATFORM_OS2_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_0="#"
     if test "x$PLATFORM_UNIX" = "x0" ; then
         COND_PLATFORM_UNIX_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_0)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_1="#"
     if test "x$PLATFORM_UNIX" = "x1" ; then
         COND_PLATFORM_UNIX_1=""
@@ -380,13 +380,13 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
         COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_0="#"
     if test "x$PLATFORM_WIN32" = "x0" ; then
         COND_PLATFORM_WIN32_0=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
         COND_PLATFORM_WIN32_1=""
@@ -470,7 +470,7 @@ dnl ### begin block 20_COND_SHARED_0_WXUSE_ZLIB_BUILTIN[wx.bkl] ###
         COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
     fi
     AC_SUBST(COND_SHARED_0_WXUSE_ZLIB_BUILTIN)
-dnl ### begin block 20_COND_SHARED_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_SHARED_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_SHARED_1="#"
     if test "x$SHARED" = "x1" ; then
         COND_SHARED_1=""
@@ -494,7 +494,7 @@ dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
         COND_TOOLKIT_=""
     fi
     AC_SUBST(COND_TOOLKIT_)
-dnl ### begin block 20_COND_TOOLKIT_COCOA[../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_COCOA[../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,wx.bkl] ###
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then
         COND_TOOLKIT_COCOA=""
@@ -560,7 +560,7 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_GTK_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_MAC[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MAC[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MAC="#"
     if test "x$TOOLKIT" = "xMAC" ; then
         COND_TOOLKIT_MAC=""
@@ -608,7 +608,7 @@ dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_MSW[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MSW[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
         COND_TOOLKIT_MSW=""
@@ -686,31 +686,31 @@ dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_X11_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
-dnl ### begin block 20_COND_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_0="#"
     if test "x$USE_EXCEPTIONS" = "x0" ; then
         COND_USE_EXCEPTIONS_0=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_0)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_1="#"
     if test "x$USE_EXCEPTIONS" = "x1" ; then
         COND_USE_EXCEPTIONS_1=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_1)
-dnl ### begin block 20_COND_USE_GUI_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
         COND_USE_GUI_0=""
     fi
     AC_SUBST(COND_USE_GUI_0)
-dnl ### begin block 20_COND_USE_GUI_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1="#"
     if test "x$USE_GUI" = "x1" ; then
         COND_USE_GUI_1=""
@@ -728,19 +728,19 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_1[wx.bkl] ###
         COND_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
-dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
-dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
@@ -764,19 +764,19 @@ dnl ### begin block 20_COND_USE_PCH_1[../../contrib/build/animate/animate.bkl,..
         COND_USE_PCH_1=""
     fi
     AC_SUBST(COND_USE_PCH_1)
-dnl ### begin block 20_COND_USE_PLUGINS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_PLUGINS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_PLUGINS_0="#"
     if test "x$USE_PLUGINS" = "x0" ; then
         COND_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_USE_PLUGINS_0)
-dnl ### begin block 20_COND_USE_RTTI_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_0="#"
     if test "x$USE_RTTI" = "x0" ; then
         COND_USE_RTTI_0=""
     fi
     AC_SUBST(COND_USE_RTTI_0)
-dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_1="#"
     if test "x$USE_RTTI" = "x1" ; then
         COND_USE_RTTI_1=""
@@ -812,13 +812,13 @@ dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[../../contrib/build/animate/anima
         COND_USE_SOVERSOLARIS_1=""
     fi
     AC_SUBST(COND_USE_SOVERSOLARIS_1)
-dnl ### begin block 20_COND_USE_THREADS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_0="#"
     if test "x$USE_THREADS" = "x0" ; then
         COND_USE_THREADS_0=""
     fi
     AC_SUBST(COND_USE_THREADS_0)
-dnl ### begin block 20_COND_USE_THREADS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_1="#"
     if test "x$USE_THREADS" = "x1" ; then
         COND_USE_THREADS_1=""
@@ -848,49 +848,49 @@ dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
         COND_WXUNIV_0=""
     fi
     AC_SUBST(COND_WXUNIV_0)
-dnl ### begin block 20_COND_WXUNIV_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUNIV_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)
-dnl ### begin block 20_COND_WXUSE_EXPAT_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_EXPAT_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUSE_EXPAT_BUILTIN="#"
     if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_WXUSE_EXPAT_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_LIBJPEG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_LIBJPEG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUSE_LIBJPEG_BUILTIN="#"
     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_WXUSE_LIBJPEG_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_LIBPNG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_LIBPNG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUSE_LIBPNG_BUILTIN="#"
     if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_WXUSE_LIBPNG_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_LIBTIFF_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_LIBTIFF_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUSE_LIBTIFF_BUILTIN="#"
     if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_WXUSE_LIBTIFF_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_ODBC_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_ODBC_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUSE_ODBC_BUILTIN="#"
     if test "x$wxUSE_ODBC" = "xbuiltin" ; then
         COND_WXUSE_ODBC_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_REGEX_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_REGEX_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_WXUSE_REGEX_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_ZLIB_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_ZLIB_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUSE_ZLIB_BUILTIN="#"
     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
         COND_WXUSE_ZLIB_BUILTIN=""
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ce5287d659..4c877b7bad 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -322,6 +322,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/module.cpp
     src/common/mstream.cpp
     src/common/object.cpp
+    src/common/powercmn.cpp
     src/common/process.cpp
     src/common/regex.cpp
     src/common/stdpbase.cpp
@@ -419,6 +420,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mstream.h
     wx/object.h
     wx/platform.h
+    wx/power.h
     wx/process.h
     wx/ptr_scpd.h
     wx/recguard.h
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index baa1e406cd..f19d2dc698 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -236,6 +236,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_module.obj \
 	$(OBJS)\monodll_mstream.obj \
 	$(OBJS)\monodll_object.obj \
+	$(OBJS)\monodll_powercmn.obj \
 	$(OBJS)\monodll_process.obj \
 	$(OBJS)\monodll_regex.obj \
 	$(OBJS)\monodll_stdpbase.obj \
@@ -345,6 +346,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_module.obj \
 	$(OBJS)\monolib_mstream.obj \
 	$(OBJS)\monolib_object.obj \
+	$(OBJS)\monolib_powercmn.obj \
 	$(OBJS)\monolib_process.obj \
 	$(OBJS)\monolib_regex.obj \
 	$(OBJS)\monolib_stdpbase.obj \
@@ -455,6 +457,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_module.obj \
 	$(OBJS)\basedll_mstream.obj \
 	$(OBJS)\basedll_object.obj \
+	$(OBJS)\basedll_powercmn.obj \
 	$(OBJS)\basedll_process.obj \
 	$(OBJS)\basedll_regex.obj \
 	$(OBJS)\basedll_stdpbase.obj \
@@ -550,6 +553,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_module.obj \
 	$(OBJS)\baselib_mstream.obj \
 	$(OBJS)\baselib_object.obj \
+	$(OBJS)\baselib_powercmn.obj \
 	$(OBJS)\baselib_process.obj \
 	$(OBJS)\baselib_regex.obj \
 	$(OBJS)\baselib_stdpbase.obj \
@@ -1322,6 +1326,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
+	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_choicdgg.obj \
 	$(OBJS)\monodll_choicbkg.obj \
 	$(OBJS)\monodll_combog.obj \
@@ -1439,6 +1444,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stattext.obj \
 	$(OBJS)\monodll_statusbr.obj \
 	$(OBJS)\monodll_textctrl.obj \
+	$(OBJS)\monodll_tglbtn.obj \
 	$(OBJS)\monodll_theme.obj \
 	$(OBJS)\monodll_toolbar.obj \
 	$(OBJS)\monodll_topluniv.obj \
@@ -1524,6 +1530,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
+	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_choicdgg.obj \
 	$(OBJS)\monodll_choicbkg.obj \
 	$(OBJS)\monodll_combog.obj \
@@ -1552,7 +1559,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavcmn.obj \
-	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
@@ -1581,7 +1587,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavcmn.obj \
-	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
@@ -1870,6 +1875,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
+	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_choicdgg.obj \
 	$(OBJS)\monolib_choicbkg.obj \
 	$(OBJS)\monolib_combog.obj \
@@ -1987,6 +1993,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stattext.obj \
 	$(OBJS)\monolib_statusbr.obj \
 	$(OBJS)\monolib_textctrl.obj \
+	$(OBJS)\monolib_tglbtn.obj \
 	$(OBJS)\monolib_theme.obj \
 	$(OBJS)\monolib_toolbar.obj \
 	$(OBJS)\monolib_topluniv.obj \
@@ -2072,6 +2079,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
+	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_choicdgg.obj \
 	$(OBJS)\monolib_choicbkg.obj \
 	$(OBJS)\monolib_combog.obj \
@@ -2100,7 +2108,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavcmn.obj \
-	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
@@ -2129,7 +2136,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavcmn.obj \
-	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
@@ -2351,6 +2357,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
+	$(OBJS)\coredll_buttonbar.obj \
 	$(OBJS)\coredll_choicdgg.obj \
 	$(OBJS)\coredll_choicbkg.obj \
 	$(OBJS)\coredll_combog.obj \
@@ -2468,6 +2475,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stattext.obj \
 	$(OBJS)\coredll_statusbr.obj \
 	$(OBJS)\coredll_textctrl.obj \
+	$(OBJS)\coredll_tglbtn.obj \
 	$(OBJS)\coredll_theme.obj \
 	$(OBJS)\coredll_toolbar.obj \
 	$(OBJS)\coredll_topluniv.obj \
@@ -2553,6 +2561,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
+	$(OBJS)\coredll_buttonbar.obj \
 	$(OBJS)\coredll_choicdgg.obj \
 	$(OBJS)\coredll_choicbkg.obj \
 	$(OBJS)\coredll_combog.obj \
@@ -2759,6 +2768,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
+	$(OBJS)\corelib_buttonbar.obj \
 	$(OBJS)\corelib_choicdgg.obj \
 	$(OBJS)\corelib_choicbkg.obj \
 	$(OBJS)\corelib_combog.obj \
@@ -2876,6 +2886,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stattext.obj \
 	$(OBJS)\corelib_statusbr.obj \
 	$(OBJS)\corelib_textctrl.obj \
+	$(OBJS)\corelib_tglbtn.obj \
 	$(OBJS)\corelib_theme.obj \
 	$(OBJS)\corelib_toolbar.obj \
 	$(OBJS)\corelib_topluniv.obj \
@@ -2961,6 +2972,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
+	$(OBJS)\corelib_buttonbar.obj \
 	$(OBJS)\corelib_choicdgg.obj \
 	$(OBJS)\corelib_choicbkg.obj \
 	$(OBJS)\corelib_combog.obj \
@@ -2993,7 +3005,6 @@ __advdll___depname = \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datavcmn.obj \
-	$(OBJS)\advdll_buttonbar.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
@@ -3022,7 +3033,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datavcmn.obj \
-	$(OBJS)\advdll_buttonbar.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
@@ -3054,7 +3064,6 @@ __advlib___depname = \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datavcmn.obj \
-	$(OBJS)\advlib_buttonbar.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
@@ -3083,7 +3092,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datavcmn.obj \
-	$(OBJS)\advlib_buttonbar.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
@@ -4194,6 +4202,9 @@ $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4419,9 +4430,6 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5215,6 +5223,16 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5625,6 +5643,11 @@ $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5750,11 +5773,6 @@ $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5978,6 +5996,9 @@ $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6203,9 +6224,6 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6999,6 +7017,16 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7409,6 +7437,11 @@ $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7534,11 +7567,6 @@ $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7765,6 +7793,9 @@ $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -8002,6 +8033,9 @@ $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -8299,9 +8333,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 
@@ -8852,6 +8883,16 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9262,6 +9303,11 @@ $(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9466,9 +9512,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 
@@ -10019,6 +10062,16 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10429,6 +10482,11 @@ $(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10561,9 +10619,6 @@ $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
-
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -10642,9 +10697,6 @@ $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
-
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 95e3cb4aab..3a3b4eb8b6 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -222,6 +222,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_module.o \
 	$(OBJS)\monodll_mstream.o \
 	$(OBJS)\monodll_object.o \
+	$(OBJS)\monodll_powercmn.o \
 	$(OBJS)\monodll_process.o \
 	$(OBJS)\monodll_regex.o \
 	$(OBJS)\monodll_stdpbase.o \
@@ -331,6 +332,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_module.o \
 	$(OBJS)\monolib_mstream.o \
 	$(OBJS)\monolib_object.o \
+	$(OBJS)\monolib_powercmn.o \
 	$(OBJS)\monolib_process.o \
 	$(OBJS)\monolib_regex.o \
 	$(OBJS)\monolib_stdpbase.o \
@@ -442,6 +444,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_module.o \
 	$(OBJS)\basedll_mstream.o \
 	$(OBJS)\basedll_object.o \
+	$(OBJS)\basedll_powercmn.o \
 	$(OBJS)\basedll_process.o \
 	$(OBJS)\basedll_regex.o \
 	$(OBJS)\basedll_stdpbase.o \
@@ -537,6 +540,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_module.o \
 	$(OBJS)\baselib_mstream.o \
 	$(OBJS)\baselib_object.o \
+	$(OBJS)\baselib_powercmn.o \
 	$(OBJS)\baselib_process.o \
 	$(OBJS)\baselib_regex.o \
 	$(OBJS)\baselib_stdpbase.o \
@@ -1333,6 +1337,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wincmn.o \
 	$(OBJS)\monodll_xpmdecod.o \
 	$(OBJS)\monodll_busyinfo.o \
+	$(OBJS)\monodll_buttonbar.o \
 	$(OBJS)\monodll_choicdgg.o \
 	$(OBJS)\monodll_choicbkg.o \
 	$(OBJS)\monodll_combog.o \
@@ -1452,6 +1457,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stattext.o \
 	$(OBJS)\monodll_statusbr.o \
 	$(OBJS)\monodll_textctrl.o \
+	$(OBJS)\monodll_tglbtn.o \
 	$(OBJS)\monodll_theme.o \
 	$(OBJS)\monodll_toolbar.o \
 	$(OBJS)\monodll_topluniv.o \
@@ -1537,6 +1543,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wincmn.o \
 	$(OBJS)\monodll_xpmdecod.o \
 	$(OBJS)\monodll_busyinfo.o \
+	$(OBJS)\monodll_buttonbar.o \
 	$(OBJS)\monodll_choicdgg.o \
 	$(OBJS)\monodll_choicbkg.o \
 	$(OBJS)\monodll_combog.o \
@@ -1566,7 +1573,6 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavcmn.o \
-	$(OBJS)\monodll_buttonbar.o \
 	$(OBJS)\monodll_calctrl.o \
 	$(OBJS)\monodll_datavgen.o \
 	$(OBJS)\monodll_datectlg.o \
@@ -1595,7 +1601,6 @@ endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavcmn.o \
-	$(OBJS)\monodll_buttonbar.o \
 	$(OBJS)\monodll_calctrl.o \
 	$(OBJS)\monodll_datavgen.o \
 	$(OBJS)\monodll_datectlg.o \
@@ -1887,6 +1892,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wincmn.o \
 	$(OBJS)\monolib_xpmdecod.o \
 	$(OBJS)\monolib_busyinfo.o \
+	$(OBJS)\monolib_buttonbar.o \
 	$(OBJS)\monolib_choicdgg.o \
 	$(OBJS)\monolib_choicbkg.o \
 	$(OBJS)\monolib_combog.o \
@@ -2006,6 +2012,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stattext.o \
 	$(OBJS)\monolib_statusbr.o \
 	$(OBJS)\monolib_textctrl.o \
+	$(OBJS)\monolib_tglbtn.o \
 	$(OBJS)\monolib_theme.o \
 	$(OBJS)\monolib_toolbar.o \
 	$(OBJS)\monolib_topluniv.o \
@@ -2091,6 +2098,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wincmn.o \
 	$(OBJS)\monolib_xpmdecod.o \
 	$(OBJS)\monolib_busyinfo.o \
+	$(OBJS)\monolib_buttonbar.o \
 	$(OBJS)\monolib_choicdgg.o \
 	$(OBJS)\monolib_choicbkg.o \
 	$(OBJS)\monolib_combog.o \
@@ -2120,7 +2128,6 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavcmn.o \
-	$(OBJS)\monolib_buttonbar.o \
 	$(OBJS)\monolib_calctrl.o \
 	$(OBJS)\monolib_datavgen.o \
 	$(OBJS)\monolib_datectlg.o \
@@ -2149,7 +2156,6 @@ endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavcmn.o \
-	$(OBJS)\monolib_buttonbar.o \
 	$(OBJS)\monolib_calctrl.o \
 	$(OBJS)\monolib_datavgen.o \
 	$(OBJS)\monolib_datectlg.o \
@@ -2384,6 +2390,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_wincmn.o \
 	$(OBJS)\coredll_xpmdecod.o \
 	$(OBJS)\coredll_busyinfo.o \
+	$(OBJS)\coredll_buttonbar.o \
 	$(OBJS)\coredll_choicdgg.o \
 	$(OBJS)\coredll_choicbkg.o \
 	$(OBJS)\coredll_combog.o \
@@ -2503,6 +2510,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stattext.o \
 	$(OBJS)\coredll_statusbr.o \
 	$(OBJS)\coredll_textctrl.o \
+	$(OBJS)\coredll_tglbtn.o \
 	$(OBJS)\coredll_theme.o \
 	$(OBJS)\coredll_toolbar.o \
 	$(OBJS)\coredll_topluniv.o \
@@ -2588,6 +2596,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_wincmn.o \
 	$(OBJS)\coredll_xpmdecod.o \
 	$(OBJS)\coredll_busyinfo.o \
+	$(OBJS)\coredll_buttonbar.o \
 	$(OBJS)\coredll_choicdgg.o \
 	$(OBJS)\coredll_choicbkg.o \
 	$(OBJS)\coredll_combog.o \
@@ -2800,6 +2809,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_wincmn.o \
 	$(OBJS)\corelib_xpmdecod.o \
 	$(OBJS)\corelib_busyinfo.o \
+	$(OBJS)\corelib_buttonbar.o \
 	$(OBJS)\corelib_choicdgg.o \
 	$(OBJS)\corelib_choicbkg.o \
 	$(OBJS)\corelib_combog.o \
@@ -2919,6 +2929,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stattext.o \
 	$(OBJS)\corelib_statusbr.o \
 	$(OBJS)\corelib_textctrl.o \
+	$(OBJS)\corelib_tglbtn.o \
 	$(OBJS)\corelib_theme.o \
 	$(OBJS)\corelib_toolbar.o \
 	$(OBJS)\corelib_topluniv.o \
@@ -3004,6 +3015,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_wincmn.o \
 	$(OBJS)\corelib_xpmdecod.o \
 	$(OBJS)\corelib_busyinfo.o \
+	$(OBJS)\corelib_buttonbar.o \
 	$(OBJS)\corelib_choicdgg.o \
 	$(OBJS)\corelib_choicbkg.o \
 	$(OBJS)\corelib_combog.o \
@@ -3041,7 +3053,6 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datavcmn.o \
-	$(OBJS)\advdll_buttonbar.o \
 	$(OBJS)\advdll_calctrl.o \
 	$(OBJS)\advdll_datavgen.o \
 	$(OBJS)\advdll_datectlg.o \
@@ -3070,7 +3081,6 @@ endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datavcmn.o \
-	$(OBJS)\advdll_buttonbar.o \
 	$(OBJS)\advdll_calctrl.o \
 	$(OBJS)\advdll_datavgen.o \
 	$(OBJS)\advdll_datectlg.o \
@@ -3106,7 +3116,6 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datavcmn.o \
-	$(OBJS)\advlib_buttonbar.o \
 	$(OBJS)\advlib_calctrl.o \
 	$(OBJS)\advlib_datavgen.o \
 	$(OBJS)\advlib_datectlg.o \
@@ -3135,7 +3144,6 @@ endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datavcmn.o \
-	$(OBJS)\advlib_buttonbar.o \
 	$(OBJS)\advlib_calctrl.o \
 	$(OBJS)\advlib_datavgen.o \
 	$(OBJS)\advlib_datectlg.o \
@@ -4298,6 +4306,9 @@ $(OBJS)\monodll_mstream.o: ../../src/common/mstream.cpp
 $(OBJS)\monodll_object.o: ../../src/common/object.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monodll_powercmn.o: ../../src/common/powercmn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_process.o: ../../src/common/process.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -4523,9 +4534,6 @@ $(OBJS)\monodll_tabctrl.o: ../../src/msw/tabctrl.cpp
 $(OBJS)\monodll_tbar95.o: ../../src/msw/tbar95.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_tglbtn.o: ../../src/msw/tglbtn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_treectrl.o: ../../src/msw/treectrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -5411,6 +5419,20 @@ $(OBJS)\monodll_textctrl.o: ../../src/univ/textctrl.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monodll_tglbtn.o: ../../src/msw/tglbtn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monodll_tglbtn.o: ../../src/univ/tglbtn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monodll_checklst.o: ../../src/msw/checklst.cpp
@@ -5829,6 +5851,11 @@ $(OBJS)\monodll_busyinfo.o: ../../src/generic/busyinfo.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_buttonbar.o: ../../src/generic/buttonbar.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_choicdgg.o: ../../src/generic/choicdgg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5954,11 +5981,6 @@ $(OBJS)\monodll_datavcmn.o: ../../src/common/datavcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_buttonbar.o: ../../src/generic/buttonbar.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6182,6 +6204,9 @@ $(OBJS)\monolib_mstream.o: ../../src/common/mstream.cpp
 $(OBJS)\monolib_object.o: ../../src/common/object.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monolib_powercmn.o: ../../src/common/powercmn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_process.o: ../../src/common/process.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -6407,9 +6432,6 @@ $(OBJS)\monolib_tabctrl.o: ../../src/msw/tabctrl.cpp
 $(OBJS)\monolib_tbar95.o: ../../src/msw/tbar95.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_tglbtn.o: ../../src/msw/tglbtn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_treectrl.o: ../../src/msw/treectrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -7295,6 +7317,20 @@ $(OBJS)\monolib_textctrl.o: ../../src/univ/textctrl.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monolib_tglbtn.o: ../../src/msw/tglbtn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monolib_tglbtn.o: ../../src/univ/tglbtn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monolib_checklst.o: ../../src/msw/checklst.cpp
@@ -7713,6 +7749,11 @@ $(OBJS)\monolib_busyinfo.o: ../../src/generic/busyinfo.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_buttonbar.o: ../../src/generic/buttonbar.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_choicdgg.o: ../../src/generic/choicdgg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7838,11 +7879,6 @@ $(OBJS)\monolib_datavcmn.o: ../../src/common/datavcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_buttonbar.o: ../../src/generic/buttonbar.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8069,6 +8105,9 @@ $(OBJS)\basedll_mstream.o: ../../src/common/mstream.cpp
 $(OBJS)\basedll_object.o: ../../src/common/object.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\basedll_powercmn.o: ../../src/common/powercmn.cpp
+	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_process.o: ../../src/common/process.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -8306,6 +8345,9 @@ $(OBJS)\baselib_mstream.o: ../../src/common/mstream.cpp
 $(OBJS)\baselib_object.o: ../../src/common/object.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\baselib_powercmn.o: ../../src/common/powercmn.cpp
+	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_process.o: ../../src/common/process.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -8603,9 +8645,6 @@ $(OBJS)\coredll_tabctrl.o: ../../src/msw/tabctrl.cpp
 $(OBJS)\coredll_tbar95.o: ../../src/msw/tbar95.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\coredll_tglbtn.o: ../../src/msw/tglbtn.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\coredll_treectrl.o: ../../src/msw/treectrl.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9248,6 +9287,20 @@ $(OBJS)\coredll_textctrl.o: ../../src/univ/textctrl.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\coredll_tglbtn.o: ../../src/msw/tglbtn.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\coredll_tglbtn.o: ../../src/univ/tglbtn.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\coredll_checklst.o: ../../src/msw/checklst.cpp
@@ -9666,6 +9719,11 @@ $(OBJS)\coredll_busyinfo.o: ../../src/generic/busyinfo.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_buttonbar.o: ../../src/generic/buttonbar.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_choicdgg.o: ../../src/generic/choicdgg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9870,9 +9928,6 @@ $(OBJS)\corelib_tabctrl.o: ../../src/msw/tabctrl.cpp
 $(OBJS)\corelib_tbar95.o: ../../src/msw/tbar95.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\corelib_tglbtn.o: ../../src/msw/tglbtn.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\corelib_treectrl.o: ../../src/msw/treectrl.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -10515,6 +10570,20 @@ $(OBJS)\corelib_textctrl.o: ../../src/univ/textctrl.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\corelib_tglbtn.o: ../../src/msw/tglbtn.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\corelib_tglbtn.o: ../../src/univ/tglbtn.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\corelib_checklst.o: ../../src/msw/checklst.cpp
@@ -10933,6 +11002,11 @@ $(OBJS)\corelib_busyinfo.o: ../../src/generic/busyinfo.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_buttonbar.o: ../../src/generic/buttonbar.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_choicdgg.o: ../../src/generic/choicdgg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11065,9 +11139,6 @@ $(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
 $(OBJS)\advdll_datavcmn.o: ../../src/common/datavcmn.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_buttonbar.o: ../../src/generic/buttonbar.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -11146,9 +11217,6 @@ $(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
 $(OBJS)\advlib_datavcmn.o: ../../src/common/datavcmn.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_buttonbar.o: ../../src/generic/buttonbar.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 4a1ea735c0..cb46c122d8 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -235,6 +235,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_module.obj \
 	$(OBJS)\monodll_mstream.obj \
 	$(OBJS)\monodll_object.obj \
+	$(OBJS)\monodll_powercmn.obj \
 	$(OBJS)\monodll_process.obj \
 	$(OBJS)\monodll_regex.obj \
 	$(OBJS)\monodll_stdpbase.obj \
@@ -349,6 +350,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_module.obj \
 	$(OBJS)\monolib_mstream.obj \
 	$(OBJS)\monolib_object.obj \
+	$(OBJS)\monolib_powercmn.obj \
 	$(OBJS)\monolib_process.obj \
 	$(OBJS)\monolib_regex.obj \
 	$(OBJS)\monolib_stdpbase.obj \
@@ -466,6 +468,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_module.obj \
 	$(OBJS)\basedll_mstream.obj \
 	$(OBJS)\basedll_object.obj \
+	$(OBJS)\basedll_powercmn.obj \
 	$(OBJS)\basedll_process.obj \
 	$(OBJS)\basedll_regex.obj \
 	$(OBJS)\basedll_stdpbase.obj \
@@ -566,6 +569,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_module.obj \
 	$(OBJS)\baselib_mstream.obj \
 	$(OBJS)\baselib_object.obj \
+	$(OBJS)\baselib_powercmn.obj \
 	$(OBJS)\baselib_process.obj \
 	$(OBJS)\baselib_regex.obj \
 	$(OBJS)\baselib_stdpbase.obj \
@@ -1481,6 +1485,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
+	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_choicdgg.obj \
 	$(OBJS)\monodll_choicbkg.obj \
 	$(OBJS)\monodll_combog.obj \
@@ -1598,6 +1603,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stattext.obj \
 	$(OBJS)\monodll_statusbr.obj \
 	$(OBJS)\monodll_textctrl.obj \
+	$(OBJS)\monodll_tglbtn.obj \
 	$(OBJS)\monodll_theme.obj \
 	$(OBJS)\monodll_toolbar.obj \
 	$(OBJS)\monodll_topluniv.obj \
@@ -1683,6 +1689,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_wincmn.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
+	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_choicdgg.obj \
 	$(OBJS)\monodll_choicbkg.obj \
 	$(OBJS)\monodll_combog.obj \
@@ -1711,7 +1718,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavcmn.obj \
-	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
@@ -1740,7 +1746,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavcmn.obj \
-	$(OBJS)\monodll_buttonbar.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
@@ -2035,6 +2040,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
+	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_choicdgg.obj \
 	$(OBJS)\monolib_choicbkg.obj \
 	$(OBJS)\monolib_combog.obj \
@@ -2152,6 +2158,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stattext.obj \
 	$(OBJS)\monolib_statusbr.obj \
 	$(OBJS)\monolib_textctrl.obj \
+	$(OBJS)\monolib_tglbtn.obj \
 	$(OBJS)\monolib_theme.obj \
 	$(OBJS)\monolib_toolbar.obj \
 	$(OBJS)\monolib_topluniv.obj \
@@ -2237,6 +2244,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_wincmn.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
+	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_choicdgg.obj \
 	$(OBJS)\monolib_choicbkg.obj \
 	$(OBJS)\monolib_combog.obj \
@@ -2265,7 +2273,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavcmn.obj \
-	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
@@ -2294,7 +2301,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavcmn.obj \
-	$(OBJS)\monolib_buttonbar.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
@@ -2546,6 +2552,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
+	$(OBJS)\coredll_buttonbar.obj \
 	$(OBJS)\coredll_choicdgg.obj \
 	$(OBJS)\coredll_choicbkg.obj \
 	$(OBJS)\coredll_combog.obj \
@@ -2663,6 +2670,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stattext.obj \
 	$(OBJS)\coredll_statusbr.obj \
 	$(OBJS)\coredll_textctrl.obj \
+	$(OBJS)\coredll_tglbtn.obj \
 	$(OBJS)\coredll_theme.obj \
 	$(OBJS)\coredll_toolbar.obj \
 	$(OBJS)\coredll_topluniv.obj \
@@ -2748,6 +2756,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_wincmn.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
+	$(OBJS)\coredll_buttonbar.obj \
 	$(OBJS)\coredll_choicdgg.obj \
 	$(OBJS)\coredll_choicbkg.obj \
 	$(OBJS)\coredll_combog.obj \
@@ -2960,6 +2969,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
+	$(OBJS)\corelib_buttonbar.obj \
 	$(OBJS)\corelib_choicdgg.obj \
 	$(OBJS)\corelib_choicbkg.obj \
 	$(OBJS)\corelib_combog.obj \
@@ -3077,6 +3087,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stattext.obj \
 	$(OBJS)\corelib_statusbr.obj \
 	$(OBJS)\corelib_textctrl.obj \
+	$(OBJS)\corelib_tglbtn.obj \
 	$(OBJS)\corelib_theme.obj \
 	$(OBJS)\corelib_toolbar.obj \
 	$(OBJS)\corelib_topluniv.obj \
@@ -3162,6 +3173,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_wincmn.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
+	$(OBJS)\corelib_buttonbar.obj \
 	$(OBJS)\corelib_choicdgg.obj \
 	$(OBJS)\corelib_choicbkg.obj \
 	$(OBJS)\corelib_combog.obj \
@@ -3200,7 +3212,6 @@ __RUNTIME_LIBS_195 = $(__THREADSFLAG)
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datavcmn.obj \
-	$(OBJS)\advdll_buttonbar.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
@@ -3229,7 +3240,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_datavcmn.obj \
-	$(OBJS)\advdll_buttonbar.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
@@ -3267,7 +3277,6 @@ __RUNTIME_LIBS_208 = $(__THREADSFLAG)
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datavcmn.obj \
-	$(OBJS)\advlib_buttonbar.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
@@ -3296,7 +3305,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_datavcmn.obj \
-	$(OBJS)\advlib_buttonbar.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
@@ -4503,6 +4511,9 @@ $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4728,9 +4739,6 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5524,6 +5532,16 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5934,6 +5952,11 @@ $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6059,11 +6082,6 @@ $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6287,6 +6305,9 @@ $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6512,9 +6533,6 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -7308,6 +7326,16 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7718,6 +7746,11 @@ $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7843,11 +7876,6 @@ $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8074,6 +8102,9 @@ $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -8311,6 +8342,9 @@ $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
 $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
@@ -8608,9 +8642,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
 $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 
@@ -9161,6 +9192,16 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9571,6 +9612,11 @@ $(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9775,9 +9821,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
 $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 
@@ -10328,6 +10371,16 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10738,6 +10791,11 @@ $(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10870,9 +10928,6 @@ $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
-
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -10951,9 +11006,6 @@ $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
-
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 5a4f57bea4..640f9740cc 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -358,6 +358,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_wincmn.obj &
 	$(OBJS)\monodll_xpmdecod.obj &
 	$(OBJS)\monodll_busyinfo.obj &
+	$(OBJS)\monodll_buttonbar.obj &
 	$(OBJS)\monodll_choicdgg.obj &
 	$(OBJS)\monodll_choicbkg.obj &
 	$(OBJS)\monodll_combog.obj &
@@ -477,6 +478,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_stattext.obj &
 	$(OBJS)\monodll_statusbr.obj &
 	$(OBJS)\monodll_textctrl.obj &
+	$(OBJS)\monodll_tglbtn.obj &
 	$(OBJS)\monodll_theme.obj &
 	$(OBJS)\monodll_toolbar.obj &
 	$(OBJS)\monodll_topluniv.obj &
@@ -562,6 +564,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_wincmn.obj &
 	$(OBJS)\monodll_xpmdecod.obj &
 	$(OBJS)\monodll_busyinfo.obj &
+	$(OBJS)\monodll_buttonbar.obj &
 	$(OBJS)\monodll_choicdgg.obj &
 	$(OBJS)\monodll_choicbkg.obj &
 	$(OBJS)\monodll_combog.obj &
@@ -592,7 +595,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_datavcmn.obj &
-	$(OBJS)\monodll_buttonbar.obj &
 	$(OBJS)\monodll_calctrl.obj &
 	$(OBJS)\monodll_datavgen.obj &
 	$(OBJS)\monodll_datectlg.obj &
@@ -621,7 +623,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_datavcmn.obj &
-	$(OBJS)\monodll_buttonbar.obj &
 	$(OBJS)\monodll_calctrl.obj &
 	$(OBJS)\monodll_datavgen.obj &
 	$(OBJS)\monodll_datectlg.obj &
@@ -916,6 +917,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_wincmn.obj &
 	$(OBJS)\monolib_xpmdecod.obj &
 	$(OBJS)\monolib_busyinfo.obj &
+	$(OBJS)\monolib_buttonbar.obj &
 	$(OBJS)\monolib_choicdgg.obj &
 	$(OBJS)\monolib_choicbkg.obj &
 	$(OBJS)\monolib_combog.obj &
@@ -1035,6 +1037,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_stattext.obj &
 	$(OBJS)\monolib_statusbr.obj &
 	$(OBJS)\monolib_textctrl.obj &
+	$(OBJS)\monolib_tglbtn.obj &
 	$(OBJS)\monolib_theme.obj &
 	$(OBJS)\monolib_toolbar.obj &
 	$(OBJS)\monolib_topluniv.obj &
@@ -1120,6 +1123,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_wincmn.obj &
 	$(OBJS)\monolib_xpmdecod.obj &
 	$(OBJS)\monolib_busyinfo.obj &
+	$(OBJS)\monolib_buttonbar.obj &
 	$(OBJS)\monolib_choicdgg.obj &
 	$(OBJS)\monolib_choicbkg.obj &
 	$(OBJS)\monolib_combog.obj &
@@ -1150,7 +1154,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_datavcmn.obj &
-	$(OBJS)\monolib_buttonbar.obj &
 	$(OBJS)\monolib_calctrl.obj &
 	$(OBJS)\monolib_datavgen.obj &
 	$(OBJS)\monolib_datectlg.obj &
@@ -1179,7 +1182,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_datavcmn.obj &
-	$(OBJS)\monolib_buttonbar.obj &
 	$(OBJS)\monolib_calctrl.obj &
 	$(OBJS)\monolib_datavgen.obj &
 	$(OBJS)\monolib_datectlg.obj &
@@ -1420,6 +1422,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_wincmn.obj &
 	$(OBJS)\coredll_xpmdecod.obj &
 	$(OBJS)\coredll_busyinfo.obj &
+	$(OBJS)\coredll_buttonbar.obj &
 	$(OBJS)\coredll_choicdgg.obj &
 	$(OBJS)\coredll_choicbkg.obj &
 	$(OBJS)\coredll_combog.obj &
@@ -1539,6 +1542,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_stattext.obj &
 	$(OBJS)\coredll_statusbr.obj &
 	$(OBJS)\coredll_textctrl.obj &
+	$(OBJS)\coredll_tglbtn.obj &
 	$(OBJS)\coredll_theme.obj &
 	$(OBJS)\coredll_toolbar.obj &
 	$(OBJS)\coredll_topluniv.obj &
@@ -1624,6 +1628,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_wincmn.obj &
 	$(OBJS)\coredll_xpmdecod.obj &
 	$(OBJS)\coredll_busyinfo.obj &
+	$(OBJS)\coredll_buttonbar.obj &
 	$(OBJS)\coredll_choicdgg.obj &
 	$(OBJS)\coredll_choicbkg.obj &
 	$(OBJS)\coredll_combog.obj &
@@ -1838,6 +1843,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_wincmn.obj &
 	$(OBJS)\corelib_xpmdecod.obj &
 	$(OBJS)\corelib_busyinfo.obj &
+	$(OBJS)\corelib_buttonbar.obj &
 	$(OBJS)\corelib_choicdgg.obj &
 	$(OBJS)\corelib_choicbkg.obj &
 	$(OBJS)\corelib_combog.obj &
@@ -1957,6 +1963,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_stattext.obj &
 	$(OBJS)\corelib_statusbr.obj &
 	$(OBJS)\corelib_textctrl.obj &
+	$(OBJS)\corelib_tglbtn.obj &
 	$(OBJS)\corelib_theme.obj &
 	$(OBJS)\corelib_toolbar.obj &
 	$(OBJS)\corelib_topluniv.obj &
@@ -2042,6 +2049,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_wincmn.obj &
 	$(OBJS)\corelib_xpmdecod.obj &
 	$(OBJS)\corelib_busyinfo.obj &
+	$(OBJS)\corelib_buttonbar.obj &
 	$(OBJS)\corelib_choicdgg.obj &
 	$(OBJS)\corelib_choicbkg.obj &
 	$(OBJS)\corelib_combog.obj &
@@ -2081,7 +2089,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_datavcmn.obj &
-	$(OBJS)\advdll_buttonbar.obj &
 	$(OBJS)\advdll_calctrl.obj &
 	$(OBJS)\advdll_datavgen.obj &
 	$(OBJS)\advdll_datectlg.obj &
@@ -2110,7 +2117,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_datavcmn.obj &
-	$(OBJS)\advdll_buttonbar.obj &
 	$(OBJS)\advdll_calctrl.obj &
 	$(OBJS)\advdll_datavgen.obj &
 	$(OBJS)\advdll_datectlg.obj &
@@ -2148,7 +2154,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_datavcmn.obj &
-	$(OBJS)\advlib_buttonbar.obj &
 	$(OBJS)\advlib_calctrl.obj &
 	$(OBJS)\advlib_datavgen.obj &
 	$(OBJS)\advlib_datectlg.obj &
@@ -2177,7 +2182,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_datavcmn.obj &
-	$(OBJS)\advlib_buttonbar.obj &
 	$(OBJS)\advlib_calctrl.obj &
 	$(OBJS)\advlib_datavgen.obj &
 	$(OBJS)\advlib_datectlg.obj &
@@ -2702,6 +2706,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_module.obj &
 	$(OBJS)\monodll_mstream.obj &
 	$(OBJS)\monodll_object.obj &
+	$(OBJS)\monodll_powercmn.obj &
 	$(OBJS)\monodll_process.obj &
 	$(OBJS)\monodll_regex.obj &
 	$(OBJS)\monodll_stdpbase.obj &
@@ -2812,6 +2817,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_module.obj &
 	$(OBJS)\monolib_mstream.obj &
 	$(OBJS)\monolib_object.obj &
+	$(OBJS)\monolib_powercmn.obj &
 	$(OBJS)\monolib_process.obj &
 	$(OBJS)\monolib_regex.obj &
 	$(OBJS)\monolib_stdpbase.obj &
@@ -2922,6 +2928,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_module.obj &
 	$(OBJS)\basedll_mstream.obj &
 	$(OBJS)\basedll_object.obj &
+	$(OBJS)\basedll_powercmn.obj &
 	$(OBJS)\basedll_process.obj &
 	$(OBJS)\basedll_regex.obj &
 	$(OBJS)\basedll_stdpbase.obj &
@@ -3017,6 +3024,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_module.obj &
 	$(OBJS)\baselib_mstream.obj &
 	$(OBJS)\baselib_object.obj &
+	$(OBJS)\baselib_powercmn.obj &
 	$(OBJS)\baselib_process.obj &
 	$(OBJS)\baselib_regex.obj &
 	$(OBJS)\baselib_stdpbase.obj &
@@ -4498,6 +4506,9 @@ $(OBJS)\monodll_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\monodll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4723,9 +4734,6 @@ $(OBJS)\monodll_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
 $(OBJS)\monodll_tbar95.obj :  .AUTODEPEND ..\..\src\msw\tbar95.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_treectrl.obj :  .AUTODEPEND ..\..\src\msw\treectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -5611,6 +5619,20 @@ $(OBJS)\monodll_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monodll_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monodll_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monodll_checklst.obj :  .AUTODEPEND ..\..\src\msw\checklst.cpp
@@ -6029,6 +6051,11 @@ $(OBJS)\monodll_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6154,11 +6181,6 @@ $(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6382,6 +6404,9 @@ $(OBJS)\monolib_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\monolib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6607,9 +6632,6 @@ $(OBJS)\monolib_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
 $(OBJS)\monolib_tbar95.obj :  .AUTODEPEND ..\..\src\msw\tbar95.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_treectrl.obj :  .AUTODEPEND ..\..\src\msw\treectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -7495,6 +7517,20 @@ $(OBJS)\monolib_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monolib_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monolib_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monolib_checklst.obj :  .AUTODEPEND ..\..\src\msw\checklst.cpp
@@ -7913,6 +7949,11 @@ $(OBJS)\monolib_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8038,11 +8079,6 @@ $(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8269,6 +8305,9 @@ $(OBJS)\basedll_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\basedll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -8506,6 +8545,9 @@ $(OBJS)\baselib_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\baselib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_process.obj :  .AUTODEPEND ..\..\src\common\process.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -8803,9 +8845,6 @@ $(OBJS)\coredll_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
 $(OBJS)\coredll_tbar95.obj :  .AUTODEPEND ..\..\src\msw\tbar95.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
-$(OBJS)\coredll_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
 $(OBJS)\coredll_treectrl.obj :  .AUTODEPEND ..\..\src\msw\treectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -9448,6 +9487,20 @@ $(OBJS)\coredll_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\coredll_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\coredll_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\coredll_checklst.obj :  .AUTODEPEND ..\..\src\msw\checklst.cpp
@@ -9866,6 +9919,11 @@ $(OBJS)\coredll_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -10070,9 +10128,6 @@ $(OBJS)\corelib_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
 $(OBJS)\corelib_tbar95.obj :  .AUTODEPEND ..\..\src\msw\tbar95.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
-$(OBJS)\corelib_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
 $(OBJS)\corelib_treectrl.obj :  .AUTODEPEND ..\..\src\msw\treectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -10715,6 +10770,20 @@ $(OBJS)\corelib_textctrl.obj :  .AUTODEPEND ..\..\src\univ\textctrl.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\corelib_tglbtn.obj :  .AUTODEPEND ..\..\src\msw\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\corelib_tglbtn.obj :  .AUTODEPEND ..\..\src\univ\tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\corelib_checklst.obj :  .AUTODEPEND ..\..\src\msw\checklst.cpp
@@ -11133,6 +11202,11 @@ $(OBJS)\corelib_busyinfo.obj :  .AUTODEPEND ..\..\src\generic\busyinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -11265,9 +11339,6 @@ $(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
 $(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
 $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -11346,9 +11417,6 @@ $(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
 $(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
 $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index d9882bb8c0..ad33d487b6 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -612,10 +612,6 @@ SOURCE=..\..\src\msw\version.rc
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\generic\buttonbar.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\generic\calctrl.cpp
 # End Source File
 # Begin Source File
@@ -1121,10 +1117,6 @@ SOURCE=..\..\include\wx\msw\taskbar.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\buttonbar.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 0ac699b71a..294c71bcd7 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -605,6 +605,10 @@ SOURCE=..\..\src\common\object.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\powercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\process.cpp
 # End Source File
 # Begin Source File
@@ -1619,6 +1623,10 @@ SOURCE=..\..\include\wx\platform.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\power.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\process.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 38b212ff8a..11dc418ff0 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -4085,6 +4085,10 @@ SOURCE=..\..\src\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\buttonbar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\choicbkg.cpp
 # End Source File
 # Begin Source File
@@ -6877,6 +6881,69 @@ SOURCE=..\..\src\univ\textctrl.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\univ\tglbtn.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
diff --git a/docs/changes.txt b/docs/changes.txt
index dee7a71b9f..eba4000562 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -75,6 +75,7 @@ All:
 - Added wxString::EndsWith()
 - wxSocket::_Read continues reading from socket after exhausting pushback buffer.
   Previously, only the buffer would be returned, even if more data was requested.
+- Added wxPowerEvent (currently MSW-only)
 
 All (GUI):
 
diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index 93257fe33a..14d1f8866c 100644
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -255,6 +255,7 @@
 \input pen.tex
 \input point.tex
 \input postscpt.tex
+\input powerevt.tex
 \input prevwin.tex
 \input print.tex
 \input process.tex
diff --git a/docs/latex/wx/powerevt.tex b/docs/latex/wx/powerevt.tex
new file mode 100644
index 0000000000..be5314fb23
--- /dev/null
+++ b/docs/latex/wx/powerevt.tex
@@ -0,0 +1,67 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        powerevt.tex
+%% Purpose:     wxPowerEvent documentation
+%% Author:      Vadim Zeitlin
+%% Created:     2006-05-27
+%% RCS-ID:      $Id$
+%% Copyright:   (C) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+%% License:     wxWindows license
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxPowerEvent}}\label{wxpowerevent}
+
+The power events are generated when the system power state changes, e.g. the
+system is suspended, hibernated, plugged into or unplugged from the wall socket
+and so on.
+
+Notice that currently only suspend and resume events are generated and only
+under MS Windows platform. To avoid the need to change the code using this
+event later when these events are implemented on the other platforms please use
+the test \texttt{#ifdef wxHAS\_POWER\_EVENTS} instead of directly testing for
+the platform in your code: this symbol will be defined for all platforms
+supporting the power events.
+
+\wxheading{Event table macros}
+
+To process power events, use these macros to handle them in
+member functions that take a wxPowerEvent argument.
+
+\twocolwidtha{9cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{\textbf{EVT\_POWER\_SUSPENDING(func)}}{System is about to be suspended, this
+event can be vetoed to prevent suspend from taking place.}
+\twocolitem{\textbf{EVT\_POWER\_SUSPENDED(func)}}{System is about to suspend: normally the
+application should quickly (i.e. without user intervention) close all the open
+files and network connections here, possibly remembering them to reopen them
+later when the system is resumed.}
+\twocolitem{\textbf{EVT\_POWER\_SUSPEND\_CANCEL(func)}}{System suspension was cancelled
+because some application vetoed it.}
+\twocolitem{\textbf{EVT\_POWER\_RESUME(func)}}{System resumed from suspend:
+normally the application should restore the state in which it had been before
+the suspension.}
+\end{twocollist}%
+
+\wxheading{Derived from}
+
+\helpref{wxEvent}{wxevent}\\
+\helpref{wxObject}{wxobject}
+
+\wxheading{Include files}
+
+<wx/power.h>
+
+\wxheading{See also}
+
+\helpref{wxGetPowerType}{wxgetpowertype}, \helpref{wxGetBatteryState}{wxgetbatterystate}
+
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxPowerEvent::Veto}\label{wxpowereventveto}
+
+\func{void}{Veto}{\void}
+
+Call this to prevent suspend from taking place in 
+\texttt{wxEVT\_POWER\_SUSPENDING} handler (it is ignored for all the others).
+
+
diff --git a/include/wx/event.h b/include/wx/event.h
index 6fce7406bd..63c852c617 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -230,7 +230,7 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_END_SESSION, 403)
     DECLARE_EVENT_TYPE(wxEVT_QUERY_END_SESSION, 404)
     DECLARE_EVENT_TYPE(wxEVT_ACTIVATE_APP, 405)
-    DECLARE_EVENT_TYPE(wxEVT_POWER, 406)
+    // 406..408 are power events
     DECLARE_EVENT_TYPE(wxEVT_ACTIVATE, 409)
     DECLARE_EVENT_TYPE(wxEVT_CREATE, 410)
     DECLARE_EVENT_TYPE(wxEVT_DESTROY, 411)
@@ -266,6 +266,7 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_SIZING, 441)
     DECLARE_EVENT_TYPE(wxEVT_MOVING, 442)
     DECLARE_EVENT_TYPE(wxEVT_HIBERNATE, 443)
+    // more power events follow -- see wx/power.h
 
         // Clipboard events
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_COPY, 444)
@@ -2160,7 +2161,6 @@ private:
 #endif // wxUSE_GUI
 
 /* TODO
- wxEVT_POWER,
  wxEVT_MOUSE_CAPTURE_CHANGED,
  wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
 // wxEVT_FONT_CHANGED,  // WM_FONTCHANGE: roll into wxEVT_SETTING_CHANGED, but remember to propagate
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index d9c3e215ad..3179973c7c 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -339,6 +339,9 @@ public:
 
     bool HandleSetCursor(WXHWND hWnd, short nHitTest, int mouseMsg);
 
+    bool HandlePower(WXWPARAM wParam, WXLPARAM lParam, bool *vetoed);
+
+
     // Window procedure
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
diff --git a/include/wx/power.h b/include/wx/power.h
new file mode 100644
index 0000000000..e70fb6c215
--- /dev/null
+++ b/include/wx/power.h
@@ -0,0 +1,108 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/include/wx/power.h
+// Purpose:     functions and classes for system power management
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2006-05-27
+// RCS-ID:      $Id$
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_POWER_H_
+#define _WX_POWER_H_
+
+#include "wx/event.h"
+
+// ----------------------------------------------------------------------------
+// power management constants
+// ----------------------------------------------------------------------------
+
+enum wxPowerType
+{
+    wxPOWER_SOCKET,
+    wxPOWER_BATTERY,
+    wxPOWER_UNKNOWN
+};
+
+enum wxBatteryState
+{
+    wxBATTERY_NORMAL_STATE,    // system is fully usable
+    wxBATTERY_LOW_STATE,       // start to worry
+    wxBATTERY_CRITICAL_STATE,  // save quickly
+    wxBATTERY_SHUTDOWN_STATE,  // too late
+    wxBATTERY_UNKNOWN_STATE
+};
+
+// ----------------------------------------------------------------------------
+// wxPowerEvent is generated when the system online status changes
+// ----------------------------------------------------------------------------
+
+// currently the power events are only available under Windows, to avoid
+// compiling in the code for handling them which is never going to be invoked
+// under the other platforms, we define wxHAS_POWER_EVENTS symbol if this event
+// is available, it should be used to guard all code using wxPowerEvent
+#ifdef __WXMSW__
+
+#define wxHAS_POWER_EVENTS
+
+class WXDLLIMPEXP_BASE wxPowerEvent : public wxEvent
+{
+public:
+    wxPowerEvent(wxEventType evtType) : wxEvent(wxID_NONE, evtType)
+    {
+        m_veto = false;
+    }
+
+    // Veto the operation (only makes sense with EVT_POWER_SUSPENDING)
+    void Veto() { m_veto = true; }
+
+    bool IsVetoed() const { return m_veto; }
+
+
+    // default copy ctor, assignment operator and dtor are ok
+
+    virtual wxEvent *Clone() const { return new wxPowerEvent(*this); }
+
+private:
+    bool m_veto;
+};
+
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_POWER_SUSPENDING, 406)
+    DECLARE_EVENT_TYPE(wxEVT_POWER_SUSPENDED, 407)
+    DECLARE_EVENT_TYPE(wxEVT_POWER_SUSPEND_CANCEL, 408)
+    DECLARE_EVENT_TYPE(wxEVT_POWER_RESUME, 444)
+END_DECLARE_EVENT_TYPES()
+
+typedef void (wxEvtHandler::*wxPowerEventFunction)(wxPowerEvent&);
+
+#define wxPowerEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction) \
+        wxStaticCastEvent(wxPowerEventFunction, &func)
+
+#define EVT_POWER_SUSPENDING(func) \
+    wx__DECLARE_EVT0(wxEVT_POWER_SUSPENDING, wxPowerEventHandler(func))
+#define EVT_POWER_SUSPENDED(func) \
+    wx__DECLARE_EVT0(wxEVT_POWER_SUSPENDED, wxPowerEventHandler(func))
+#define EVT_POWER_SUSPEND_CANCEL(func) \
+    wx__DECLARE_EVT0(wxEVT_POWER_SUSPEND_CANCEL, wxPowerEventHandler(func))
+#define EVT_POWER_RESUME(func) \
+    wx__DECLARE_EVT0(wxEVT_POWER_RESUME, wxPowerEventHandler(func))
+
+#else // no support for power events
+    #undef wxHAS_POWER_EVENTS
+#endif // support for power events/no support
+
+// ----------------------------------------------------------------------------
+// power management functions
+// ----------------------------------------------------------------------------
+
+// return the current system power state: online or offline
+WXDLLIMPEXP_BASE wxPowerType wxGetPowerType();
+
+// return approximate battery state
+WXDLLIMPEXP_BASE wxBatteryState wxGetBatteryState();
+
+#endif // _WX_POWER_H_
+
diff --git a/include/wx/utils.h b/include/wx/utils.h
index 40305e4044..c9ee2b6182 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -412,26 +412,6 @@ enum wxShutdownFlags
 // Shutdown or reboot the PC
 WXDLLIMPEXP_BASE bool wxShutdown(wxShutdownFlags wFlags);
 
-enum wxPowerType
-{
-    wxPOWER_SOCKET,
-    wxPOWER_BATTERY,
-    wxPOWER_UNKNOWN
-};
-
-WXDLLIMPEXP_BASE wxPowerType wxGetPowerType();
-
-enum wxBatteryState
-{
-    wxBATTERY_NORMAL_STATE,    // system is fully usable
-    wxBATTERY_LOW_STATE,       // start to worry
-    wxBATTERY_CRITICAL_STATE,  // save quickly
-    wxBATTERY_SHUTDOWN_STATE,  // too late
-    wxBATTERY_UNKNOWN_STATE
-};
-
-WXDLLIMPEXP_BASE wxBatteryState wxGetBatteryState();
-
 // send the given signal to the process (only NONE and KILL are supported under
 // Windows, all others mean TERM), return 0 if ok and -1 on error
 //
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
new file mode 100644
index 0000000000..3716d448c9
--- /dev/null
+++ b/samples/power/Makefile.in
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+@MAKE_SET@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+WINDRES = @WINDRES@
+REZ = @REZ@
+SETFILE = @SETFILE@
+NM = @NM@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+LDFLAGS_GUI = @LDFLAGS_GUI@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+HOST_SUFFIX = @HOST_SUFFIX@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 2.7
+WX_VERSION = $(WX_RELEASE).0
+LIBDIRNAME = $(top_builddir)lib
+POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  \
+	$(__power___win32rc) \
+	$(__power_os2_lib_res) \
+	power_power.o
+
+### Conditionally set variables: ###
+
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
+@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
+@COND_PLATFORM_MAC_1@__power___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@	$(SETFILE) -a C power$(EXEEXT)
+@COND_PLATFORM_MAC_1@__power___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+COND_PLATFORM_OS2_1___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep power$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__power___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___power___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__power___win32rc = power_sample_rc.o
+@COND_PLATFORM_OS2_1@__power_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__power_bundle___depname = power_bundle
+@COND_TOOLKIT_COCOA@____power_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	power.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____power_BUNDLE_TGT_REF_DEP = power.app/Contents/PkgInfo
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
+	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
+	$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+	$(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+	power$(EXEEXT) Carbon.r sample.r
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
+
+### Targets: ###
+
+all: power$(EXEEXT) $(__power_bundle___depname)
+
+install: all
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f power$(EXEEXT)
+	rm -rf power.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
+	$(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+	$(__power___mac_rezcmd)
+	$(__power___mac_setfilecmd)
+	$(__power___os2_emxbindcmd)
+	$(SAMPLES_RPATH_POSTLINK)
+
+power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+	mkdir -p power.app/Contents
+	mkdir -p power.app/Contents/MacOS
+	mkdir -p power.app/Contents/Resources
+	
+	
+	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+	-e "s/EXECUTABLE/power/" \
+	-e "s/VERSION/$(WX_VERSION)/" \
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >power.app/Contents/Info.plist
+	
+	
+	echo -n "APPL????" >power.app/Contents/PkgInfo
+	
+	
+	ln -f power$(EXEEXT) power.app/Contents/MacOS/power
+	
+	
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns power.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@power_bundle: $(____power_BUNDLE_TGT_REF_DEP)
+
+power_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+
+power_power.o: $(srcdir)/power.cpp
+	$(CXXC) -c -o $@ $(POWER_CXXFLAGS) $(srcdir)/power.cpp
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include .deps/*.d
+
+.PHONY: all install uninstall clean distclean power_bundle
diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc
new file mode 100644
index 0000000000..08764a4fb5
--- /dev/null
+++ b/samples/power/makefile.bcc
@@ -0,0 +1,225 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 27
+OBJS = \
+	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	-I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH \
+	$(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  \
+	$(OBJS)\power_power.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\power.exe
+
+clean: 
+	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+	-if exist $(OBJS)\*.res del $(OBJS)\*.res
+	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+	-if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+	-if exist $(OBJS)\power.tds del $(OBJS)\power.tds
+	-if exist $(OBJS)\power.ilc del $(OBJS)\power.ilc
+	-if exist $(OBJS)\power.ild del $(OBJS)\power.ild
+	-if exist $(OBJS)\power.ilf del $(OBJS)\power.ilf
+	-if exist $(OBJS)\power.ils del $(OBJS)\power.ils
+
+$(OBJS)\power.exe: $(POWER_OBJECTS)  $(OBJS)\power_sample.res
+	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+	c0w32.obj $(POWER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\power_sample.res
+|
+
+$(OBJS)\power_sample.res: .\..\..\samples\sample.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
+
+$(OBJS)\power_power.obj: .\power.cpp
+	$(CXX) -q -c -P -o$@ $(POWER_CXXFLAGS) $**
+
diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc
new file mode 100644
index 0000000000..4f6c2cfaf9
--- /dev/null
+++ b/samples/power/makefile.gcc
@@ -0,0 +1,223 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 27
+OBJS = \
+	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	-I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+	-DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+	$(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  \
+	$(OBJS)\power_sample_rc.o \
+	$(OBJS)\power_power.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+WXDEBUGFLAG = d
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\power.exe
+
+clean: 
+	-if exist $(OBJS)\*.o del $(OBJS)\*.o
+	-if exist $(OBJS)\*.d del $(OBJS)\*.d
+	-if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+
+$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o
+	$(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+
+$(OBJS)\power_sample_rc.o: ./../../samples/sample.rc
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
+
+$(OBJS)\power_power.o: ./power.cpp
+	$(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc
new file mode 100644
index 0000000000..f4527ff5e9
--- /dev/null
+++ b/samples/power/makefile.vc
@@ -0,0 +1,300 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 27
+OBJS = \
+	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = .\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
+	$(__DEBUGINFO_0) /Fd$(OBJS)\power.pdb $(____DEBUGRUNTIME_2_p) \
+	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	/I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
+	/I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
+	$(CXXFLAGS)
+POWER_OBJECTS =  \
+	$(OBJS)\power_sample.res \
+	$(OBJS)\power_power.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_3 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_4 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_4 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_7 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_7 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_9 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_9 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_10 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_10 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\power.exe
+
+clean: 
+	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+	-if exist $(OBJS)\*.res del $(OBJS)\*.res
+	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+	-if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+	-if exist $(OBJS)\power.ilk del $(OBJS)\power.ilk
+	-if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb
+
+$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res
+	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+	$(POWER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
+<<
+
+$(OBJS)\power_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
+
+$(OBJS)\power_power.obj: .\power.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(POWER_CXXFLAGS) $**
+
diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat
new file mode 100644
index 0000000000..c79184f167
--- /dev/null
+++ b/samples/power/makefile.wat
@@ -0,0 +1,253 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+!  loaddll wlink    wlink
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+WXDEBUGFLAG = d
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 27
+OBJS = &
+	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -wx -wcd=549 &
+	-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
+	$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  &
+	$(OBJS)\power_power.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\power.exe
+
+clean : .SYMBOLIC 
+	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+	-if exist $(OBJS)\*.res del $(OBJS)\*.res
+	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+	-if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+
+$(OBJS)\power.exe :  $(POWER_OBJECTS) $(OBJS)\power_sample.res
+	@%create $(OBJS)\power.lbc
+	@%append $(OBJS)\power.lbc option quiet
+	@%append $(OBJS)\power.lbc name $^@
+	@%append $(OBJS)\power.lbc option caseexact
+	@%append $(OBJS)\power.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+	@for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i
+	@for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\power.lbc library %i
+	@%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res
+	@for %i in () do @%append $(OBJS)\power.lbc option stack=%i
+	wlink @$(OBJS)\power.lbc
+
+$(OBJS)\power_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+
+$(OBJS)\power_power.obj :  .AUTODEPEND .\power.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(POWER_CXXFLAGS) $<
+
diff --git a/samples/power/power.bkl b/samples/power/power.bkl
new file mode 100644
index 0000000000..89150a13ae
--- /dev/null
+++ b/samples/power/power.bkl
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="power" template="wx_sample" template_append="wx_append">
+        <sources>power.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+    </exe>
+</makefile>
+
diff --git a/samples/power/power.cpp b/samples/power/power.cpp
new file mode 100644
index 0000000000..04b9ab3c63
--- /dev/null
+++ b/samples/power/power.cpp
@@ -0,0 +1,120 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        power.cpp
+// Purpose:     wxWidgets power management sample
+// Author:      Vadim Zeitlin
+// Created:     2006-05-27
+// RCS-ID:      $Id$
+// Copyright:   (C) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+#endif
+
+#include "wx/textctrl.h"
+#include "wx/msgdlg.h"
+
+#include "wx/power.h"
+
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+
+// ----------------------------------------------------------------------------
+// main frame class
+// ----------------------------------------------------------------------------
+
+class MyFrame : public wxFrame
+{
+public:
+    MyFrame()
+        : wxFrame(NULL, wxID_ANY, _T("wxWidgets Power Management Sample"),
+                  wxDefaultPosition, wxSize(500, 200))
+    {
+        wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, _T(""),
+                                          wxDefaultPosition, wxDefaultSize,
+                                          wxTE_MULTILINE | wxTE_READONLY);
+        m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(text));
+
+        SetIcon(wxICON(sample));
+
+        Show();
+    }
+
+    virtual ~MyFrame()
+    {
+        delete wxLog::SetActiveTarget(m_logOld);
+    }
+
+private:
+    void OnSuspending(wxPowerEvent& event)
+    {
+        wxLogMessage(_T("System suspend starting..."));
+        if ( wxMessageBox(_T("Veto suspend?"), _T("Please answer"),
+                          wxYES_NO, this) == wxYES )
+        {
+            event.Veto();
+            wxLogMessage(_T("Vetoed suspend."));
+        }
+    }
+
+    void OnSuspended(wxPowerEvent& WXUNUSED(event))
+    {
+        wxLogMessage(_T("System is going to suspend."));
+    }
+
+    void OnSuspendCancel(wxPowerEvent& WXUNUSED(event))
+    {
+        wxLogMessage(_T("System suspend was cancelled."));
+    }
+
+    void OnResume(wxPowerEvent& WXUNUSED(event))
+    {
+        wxLogMessage(_T("System resumed from suspend."));
+    }
+
+
+    wxLog *m_logOld;
+
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_POWER_SUSPENDING(MyFrame::OnSuspending)
+    EVT_POWER_SUSPENDED(MyFrame::OnSuspended)
+    EVT_POWER_SUSPEND_CANCEL(MyFrame::OnSuspendCancel)
+    EVT_POWER_RESUME(MyFrame::OnResume)
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// main application class
+// ----------------------------------------------------------------------------
+
+class MyApp : public wxApp
+{
+public:
+    virtual bool OnInit()
+    {
+        new MyFrame;
+
+        return true;
+    }
+};
+
+IMPLEMENT_APP(MyApp)
diff --git a/samples/power/power.dsp b/samples/power/power.dsp
new file mode 100644
index 0000000000..25a78b5ea8
--- /dev/null
+++ b/samples/power/power.dsp
@@ -0,0 +1,480 @@
+# Microsoft Developer Studio Project File - Name="power" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=power - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "power.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "power.mak" CFG="power - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "power - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 DLL Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 DLL Debug" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "power - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "power - Win32 DLL Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswunivudll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswunivudll"
+# PROP Intermediate_Dir "vc_mswunivudll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 DLL Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivuddll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivuddll"
+# PROP Intermediate_Dir "vc_mswunivuddll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 DLL Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswunivdll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswunivdll"
+# PROP Intermediate_Dir "vc_mswunivdll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 DLL Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivddll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivddll"
+# PROP Intermediate_Dir "vc_mswunivddll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 DLL Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswudll"
+# PROP BASE Intermediate_Dir "vc_mswudll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswudll"
+# PROP Intermediate_Dir "vc_mswudll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 DLL Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswuddll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswuddll"
+# PROP Intermediate_Dir "vc_mswuddll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswdll"
+# PROP BASE Intermediate_Dir "vc_mswdll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswdll"
+# PROP Intermediate_Dir "vc_mswdll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswdll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\power.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswddll"
+# PROP BASE Intermediate_Dir "vc_mswddll\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswddll"
+# PROP Intermediate_Dir "vc_mswddll\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\power.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswunivu"
+# PROP BASE Intermediate_Dir "vc_mswunivu\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswunivu"
+# PROP Intermediate_Dir "vc_mswunivu\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivud"
+# PROP BASE Intermediate_Dir "vc_mswunivud\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivud"
+# PROP Intermediate_Dir "vc_mswunivud\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswuniv"
+# PROP BASE Intermediate_Dir "vc_mswuniv\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswuniv"
+# PROP Intermediate_Dir "vc_mswuniv\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivd"
+# PROP BASE Intermediate_Dir "vc_mswunivd\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivd"
+# PROP Intermediate_Dir "vc_mswunivd\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswu"
+# PROP BASE Intermediate_Dir "vc_mswu\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswu"
+# PROP Intermediate_Dir "vc_mswu\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswud"
+# PROP BASE Intermediate_Dir "vc_mswud\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswud"
+# PROP Intermediate_Dir "vc_mswud\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_msw"
+# PROP BASE Intermediate_Dir "vc_msw\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_msw"
+# PROP Intermediate_Dir "vc_msw\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_msw\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\power.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "power - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswd"
+# PROP BASE Intermediate_Dir "vc_mswd\power"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswd"
+# PROP Intermediate_Dir "vc_mswd\power"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\power.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\power.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ENDIF
+
+# Begin Target
+
+# Name "power - Win32 DLL Universal Unicode Release"
+# Name "power - Win32 DLL Universal Unicode Debug"
+# Name "power - Win32 DLL Universal Release"
+# Name "power - Win32 DLL Universal Debug"
+# Name "power - Win32 DLL Unicode Release"
+# Name "power - Win32 DLL Unicode Debug"
+# Name "power - Win32 DLL Release"
+# Name "power - Win32 DLL Debug"
+# Name "power - Win32 Universal Unicode Release"
+# Name "power - Win32 Universal Unicode Debug"
+# Name "power - Win32 Universal Release"
+# Name "power - Win32 Universal Debug"
+# Name "power - Win32 Unicode Release"
+# Name "power - Win32 Unicode Debug"
+# Name "power - Win32 Release"
+# Name "power - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\power.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\..\..\samples\sample.rc
+# End Source File
+# End Group
+# End Target
+# End Project
+
diff --git a/src/common/powercmn.cpp b/src/common/powercmn.cpp
new file mode 100644
index 0000000000..7e5cbcc65b
--- /dev/null
+++ b/src/common/powercmn.cpp
@@ -0,0 +1,57 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/powercmn.cpp
+// Purpose:     power event types and stubs for power functions
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2006-05-27
+// RCS-ID:      $Id$
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#include "wx/power.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+#ifdef wxHAS_POWER_EVENTS
+    DEFINE_EVENT_TYPE(wxEVT_POWER_SUSPENDING)
+    DEFINE_EVENT_TYPE(wxEVT_POWER_SUSPENDED)
+    DEFINE_EVENT_TYPE(wxEVT_POWER_SUSPEND_CANCEL)
+    DEFINE_EVENT_TYPE(wxEVT_POWER_RESUME)
+#endif
+
+// provide stubs for the systems not implementing these functions
+#if !defined(__WXPALMOS__) && !defined(__WXMSW__)
+
+wxPowerType wxGetPowerType()
+{
+    return wxPOWER_UNKNOWN;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+    return wxBATTERY_UNKNOWN_STATE;
+}
+
+#endif // systems without power management functions
+
diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 9c706e7209..a0ccab3f28 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -328,18 +328,6 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
-wxPowerType wxGetPowerType()
-{
-    // TODO
-    return wxPOWER_UNKNOWN;
-}
-
-wxBatteryState wxGetBatteryState()
-{
-    // TODO
-    return wxBATTERY_UNKNOWN_STATE;
-}
-
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 wxMemorySize wxGetFreeMemory()
 {
diff --git a/src/mac/classic/utils.cpp b/src/mac/classic/utils.cpp
index c44ecc58da..945f1ac073 100644
--- a/src/mac/classic/utils.cpp
+++ b/src/mac/classic/utils.cpp
@@ -189,18 +189,6 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
-wxPowerType wxGetPowerType()
-{
-    // TODO
-    return wxPOWER_UNKNOWN;
-}
-
-wxBatteryState wxGetBatteryState()
-{
-    // TODO
-    return wxBATTERY_UNKNOWN_STATE;
-}
-
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 wxMemorySize wxGetFreeMemory()
 {
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 80aa2bb025..5b418e2167 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -37,6 +37,7 @@
 #include "wx/dynlib.h"
 #include "wx/dynload.h"
 #include "wx/scopeguard.h"
+#include "wx/power.h"
 
 #include "wx/confbase.h"        // for wxExpandEnvVars()
 
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 28985957c0..ac67acc1a7 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -54,6 +54,7 @@
 
 #include "wx/evtloop.h"
 #include "wx/module.h"
+#include "wx/power.h"
 #include "wx/sysopt.h"
 
 #if wxUSE_DRAG_AND_DROP
@@ -3078,6 +3079,14 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                 }
             }
             break;
+
+        case WM_POWERBROADCAST:
+            {
+                bool vetoed;
+                processed = HandlePower(wParam, lParam, &vetoed);
+                rc.result = processed && vetoed ? BROADCAST_QUERY_DENY : TRUE;
+            }
+            break;
     }
 
     if ( !processed )
@@ -3785,6 +3794,62 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
     return false;
 }
 
+bool wxWindowMSW::HandlePower(WXWPARAM wParam,
+                              WXLPARAM WXUNUSED(lParam),
+                              bool *vetoed)
+{
+    wxEventType evtType;
+    switch ( wParam )
+    {
+        case PBT_APMQUERYSUSPEND:
+            evtType = wxEVT_POWER_SUSPENDING;
+            break;
+
+        case PBT_APMQUERYSUSPENDFAILED:
+            evtType = wxEVT_POWER_SUSPEND_CANCEL;
+            break;
+
+        case PBT_APMSUSPEND:
+            evtType = wxEVT_POWER_SUSPENDED;
+            break;
+
+        case PBT_APMRESUMESUSPEND:
+            evtType = wxEVT_POWER_RESUME;
+            break;
+
+        default:
+            wxLogDebug(_T("Unknown WM_POWERBROADCAST(%d) event"), wParam);
+            // fall through
+
+        // these messages are currently not mapped to wx events
+        case PBT_APMQUERYSTANDBY:
+        case PBT_APMQUERYSTANDBYFAILED:
+        case PBT_APMSTANDBY:
+        case PBT_APMRESUMESTANDBY:
+        case PBT_APMBATTERYLOW:
+        case PBT_APMPOWERSTATUSCHANGE:
+        case PBT_APMOEMEVENT:
+        case PBT_APMRESUMEAUTOMATIC:
+        case PBT_APMRESUMECRITICAL:
+            evtType = wxEVT_NULL;
+            break;
+    }
+
+    // don't handle unknown messages
+    if ( evtType == wxEVT_NULL )
+        return false;
+
+    // TODO: notify about PBTF_APMRESUMEFROMFAILURE in case of resume events?
+
+    wxPowerEvent event(evtType);
+    if ( !GetEventHandler()->ProcessEvent(event) )
+        return false;
+
+    *vetoed = event.IsVetoed();
+
+    return true;
+}
+
 // ---------------------------------------------------------------------------
 // owner drawn stuff
 // ---------------------------------------------------------------------------
diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 00698431ff..ab4547287f 100644
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -197,18 +197,6 @@ bool wxShutdown(wxShutdownFlags WXUNUSED(wFlags))
     return false;
 }
 
-wxPowerType wxGetPowerType()
-{
-    // TODO
-    return wxPOWER_UNKNOWN;
-}
-
-wxBatteryState wxGetBatteryState()
-{
-    // TODO
-    return wxBATTERY_UNKNOWN_STATE;
-}
-
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 wxMemorySize wxGetFreeMemory()
 {
diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index e35d21ae23..788f6e6b50 100644
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -35,6 +35,7 @@
 #include "wx/apptrait.h"
 #include "wx/dynload.h"
 #include "wx/confbase.h"
+#include "wx/power.h"
 
 #include <MemoryMgr.h>
 #include <DLServer.h>
@@ -147,6 +148,10 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
+// ----------------------------------------------------------------------------
+// power management
+// ----------------------------------------------------------------------------
+
 wxPowerType wxGetPowerType()
 {
     return wxPOWER_BATTERY;
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 26ae2fbdc7..dcf05dfca4 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -403,18 +403,6 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
 }
 
-wxPowerType wxGetPowerType()
-{
-    // TODO
-    return wxPOWER_UNKNOWN;
-}
-
-wxBatteryState wxGetBatteryState()
-{
-    // TODO
-    return wxBATTERY_UNKNOWN_STATE;
-}
-
 // ----------------------------------------------------------------------------
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 16fb7ccf3a..0182d1d720 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -718,6 +718,10 @@ SOURCE=.\common\popupcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\powercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\prntbase.cpp
 # End Source File
 # Begin Source File
@@ -2743,6 +2747,10 @@ SOURCE=..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\power.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\print.h
 # End Source File
 # Begin Source File
diff --git a/wxGTK.spec b/wxGTK.spec
index d6b9ded5da..5a6a90699d 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -302,6 +302,7 @@ wx/msgout.h
 wx/mstream.h
 wx/object.h
 wx/platform.h
+wx/power.h
 wx/process.h
 wx/ptr_scpd.h
 wx/recguard.h
diff --git a/wxMotif.spec b/wxMotif.spec
index c3cce32664..00ea1a18fb 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -178,6 +178,7 @@ wx/msgout.h
 wx/mstream.h
 wx/object.h
 wx/platform.h
+wx/power.h
 wx/process.h
 wx/ptr_scpd.h
 wx/recguard.h
diff --git a/wxX11.spec b/wxX11.spec
index 2d40d01ea4..4aaf4a0963 100644
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -203,6 +203,7 @@ wx/msgout.h
 wx/mstream.h
 wx/object.h
 wx/platform.h
+wx/power.h
 wx/process.h
 wx/ptr_scpd.h
 wx/recguard.h
-- 
2.47.2

